Compare commits

...

1289 Commits

Author SHA1 Message Date
Samuele Locatelli a9983d141d ri-ordinamento region e pulizia codice x fix finale interfacce 2026-04-02 18:29:09 +02:00
Samuele Locatelli c582b88e4a Fix implementazione interfaccia IIOBController 2026-04-02 18:08:14 +02:00
Samuele Locatelli 0bcdca1148 Merge branch 'develop' of https://gitlab.steamware.net/steamware/MoonPro.net into develop 2026-04-02 18:02:46 +02:00
Samuele Locatelli a8d5f88f3d cancellazione file inutilizzati x WebAPI (abbozzata) 2026-04-02 18:02:44 +02:00
Samuele Locatelli 8039dfbc14 Rimozione file inutilizzati 2026-04-02 18:01:49 +02:00
Samuele E. Locatelli (W11-AI) f619f3f45e Merge branch 'develop' of https://gitlab.steamware.net/egalware-web/mes/mapo/MoonPro.net into develop 2026-04-02 18:01:13 +02:00
Samuele E. Locatelli (W11-AI) 85c11fb8c4 update commenti 2026-04-02 17:59:52 +02:00
Samuele Locatelli 43d613eb67 Update IIOBController x migrazione 2026-04-02 17:45:13 +02:00
Samuele E. Locatelli (W11-AI) 6276d86b5b Merge branch 'master' into develop 2026-04-02 17:15:57 +02:00
Samuele E. Locatelli (W11-AI) 9f9f980fed Aggiunta interfacce + registrazione x controllers 2026-04-02 17:14:55 +02:00
Samuele Locatelli 0bfff6fff0 Merge tag 'AddNumPzPalletApprovTCiclo' into develop
Update x display num pzPallet x approvazione variazione TCiclo
2026-04-02 07:18:22 +02:00
Samuele Locatelli 78eae161f3 Merge branch 'release/AddNumPzPalletApprovTCiclo' 2026-04-02 07:18:06 +02:00
Samuele Locatelli 7ccd2683a0 Aggiunta display num pzPallet x approvazione TCiclo (ex: Donati) 2026-04-02 07:17:31 +02:00
Samuele Locatelli a3ea802cef Merge tag 'UpdateParamsFromFluxLog_01' into develop
Update gestione salvataggio aprametri FluxLog
2026-03-11 07:45:10 +01:00
Samuele Locatelli 123f0ffc73 Merge branch 'release/UpdateParamsFromFluxLog_01' 2026-03-11 07:44:58 +01:00
Samuele Locatelli 2b9f6bae40 Update salvataggio parametri 2026-03-11 07:43:04 +01:00
Samuele Locatelli 74b347674e Merge tag 'FixRedisCall_03' into develop
Test rebuild conf progetti
2025-09-17 16:36:32 +02:00
Samuele Locatelli 75319660ad Merge branch 'release/FixRedisCall_03' 2025-09-17 16:31:28 +02:00
Samuele Locatelli d52dcba3c3 fix file progetto senza dll esterne!!! 2025-09-17 16:30:01 +02:00
Samuele Locatelli 837f319a44 Merge tag 'FixRedisCall_02' into develop
fix chaiamte reids in flood con nuova dll steamware
2025-09-17 16:24:52 +02:00
Samuele Locatelli 3c2e7103f8 Merge branch 'release/FixRedisCall_02' 2025-09-17 16:24:27 +02:00
Samuele Locatelli 59601e8884 Update nuget ultima versione + pulizia dll inutilizzate 2025-09-17 16:23:56 +02:00
Samuele Locatelli cd59b42441 Update proj x nuget nuovi (ancora da completare) 2025-09-16 10:34:21 +02:00
Samuele Locatelli 5e18508bba Update componenti nuget con cache corretta 2025-09-16 10:01:21 +02:00
Samuele Locatelli afa1e11ed0 Merge tag 'FixRedisCall_01' into develop
Update gestione nuget steamwarelibs esterne x evitare REDIS flood con
troppi call
2025-09-15 11:12:43 +02:00
Samuele Locatelli 8232cf09c0 Merge branch 'release/FixRedisCall_01' 2025-09-15 11:12:04 +02:00
Samuele Locatelli 489fce335d Update nuget steamwarelibs + modifica gestione DataLayer x evitare chaimate Redis ridondanti 2025-09-15 11:11:25 +02:00
Samuele Locatelli 968a879cb0 Update note x onlyIncr valor MBus semidefiniti positivi 2025-09-10 18:46:21 +02:00
Samuele Locatelli 6338d3f5c3 Merge tag 'FixCounterTav_01' into develop
Fix gestione chiamata contapezzi corrente su doppia tavola
2025-09-08 16:24:42 +02:00
Samuele Locatelli 486cb3d27d Merge branch 'release/FixCounterTav_01' 2025-09-08 16:24:29 +02:00
Samuele Locatelli 5473c1cf3f Fix metodo MP-IO x contapezzi su tavole 2025-09-08 16:23:59 +02:00
Samuele Locatelli d8a6b612ea Merge tag 'AddDpTask2Exe_02' into develop
Update conf ADM x test
2025-08-06 12:27:53 +02:00
Samuele Locatelli fdbc9925b5 Merge branch 'release/AddDpTask2Exe_02' 2025-08-06 12:27:41 +02:00
Samuele Locatelli 291885f352 Aggiunta (commentata) conf x DB LVF prod x test 2025-08-06 12:27:05 +02:00
Samuele Locatelli 9248716653 SDK: aggiunto conf parametri onlyIncr (es energy counter) 2025-08-05 16:25:08 +02:00
Samuele Locatelli 74ee7f4bfd Merge tag 'AddDpTask2Exe_01' into develop
Completata modifica metodi x gestione TAV DP su exeTask (get/add/rem)
2025-08-01 18:24:37 +02:00
Samuele Locatelli b2d5d460fe Merge branch 'release/AddDpTask2Exe_01' 2025-08-01 18:24:16 +02:00
Samuele Locatelli 409dd854e5 Aggiunta gestione DP anche x addTask2exe e remTask2Exe così da completare gestione DP 2025-08-01 18:23:53 +02:00
Samuele Locatelli 815c51c0fd Aggiunta gestione DP per getTas2Exe su macchina DP 2025-08-01 18:04:39 +02:00
Samuele Locatelli 15d30fc483 CodeMaid reorg classi 2025-07-24 13:04:45 +02:00
Samuele Locatelli 8c0997aaec Gestione esplicita matricola operatore x conferma prod 2025-07-24 13:01:57 +02:00
Samuele Locatelli 4e5fd73872 Merge tag 'Update_202506_03' into develop
Fix gestione sessione microsoft/redix x ADM
2025-07-04 15:40:51 +02:00
Samuele Locatelli 628f1ed15e Merge branch 'release/Update_202506_03' 2025-07-04 15:40:29 +02:00
Samuele Locatelli 647d763b97 Fix session manager microsoft/redis x ADM 2025-07-04 15:40:11 +02:00
Samuele Locatelli 71e2755355 Merge tag 'Update_202506_02' into develop
Rimozione alias metodo senza KA che si pianta sul .net framework (NON
gestisce alias servizi)
2025-07-03 18:48:16 +02:00
Samuele Locatelli 51036d4f10 Merge branch 'release/Update_202506_02' 2025-07-03 18:47:55 +02:00
Samuele Locatelli 6740cc4d1f Fix metodo FLog diretto x keepalive a valore default 2025-07-03 18:47:39 +02:00
Samuele Locatelli b2acfaef84 Merge tag 'Update_202506_01' into develop
Update x gestione invio dati senza update KeepAlive + varie giugno
2025-07-02 17:52:51 +02:00
Samuele Locatelli 8c6f3480da Merge branch 'release/Update_202506_01' 2025-07-02 17:52:11 +02:00
Samuele Locatelli 2cf43e2912 Fix metodo ambiguo flogJson con disableKA (aggiunto default val) 2025-07-02 12:20:48 +02:00
Samuele Locatelli 9b17e49e62 Cambio area memoria redis x conf Yaml x omogeneità con componenti esistenti 2025-06-30 13:54:12 +02:00
Samuele Locatelli 8d53fe433e Aggiunta metodo saveYamlConf x IOB 2025-06-30 10:15:18 +02:00
Samuele Locatelli d377c1cc86 Fix obj DataLayer x ricordione con MapoDb in loop x rebootLog track 2025-06-30 08:57:05 +02:00
Samuele E. Locatelli 185730f7a0 Aggiunto lettura parametro numrebbot2keep da config 2025-06-28 10:12:36 +02:00
Samuele E. Locatelli bd93ee1565 Update land x riduzione eventi remoterebootlog alla scrittura di nuovo record 2025-06-27 16:10:37 +02:00
Samuele E. Locatelli fe66e7fc8c SDK:
- Fix framework alla vers 4.6.2 x
2025-06-27 15:02:28 +02:00
Samuele E. Locatelli 66d3379182 ancora problemi compilazione senza framework 4 locale (lo installo...) 2025-06-27 14:56:32 +02:00
Samuele E. Locatelli 1bf2c11bfb Ancora fix flog json 2025-06-27 14:54:47 +02:00
Samuele E. Locatelli 73afda89f0 Fix conversione tipo disableKA 2025-06-27 14:53:34 +02:00
Samuele E. Locatelli d2e5bd4f4b NuGet:
- update massivo
- re-test compilazione
2025-06-27 14:51:02 +02:00
Samuele E. Locatelli 7ad387a383 Typo fix + code reorg x IO/IOB 2025-06-27 14:22:30 +02:00
Samuele E. Locatelli 3e64170d1b Aggiunto parametro disabilitazione KeepAlive per salvataggio FluxLog (singolo o json) da IOB 2025-06-27 14:20:21 +02:00
Samuele E. Locatelli 8aef753487 Merge remote-tracking branch 'gitlab.steamware/SDK' into develop 2025-06-27 09:52:55 +02:00
Samuele Locatelli bbcc2aeb70 Merge branch 'develop' into SDK 2025-06-26 18:32:49 +02:00
Samuele Locatelli 5e72ab6b66 Merge tag 'UpdateDataConfSdk_01' into develop
Update struttura data conf x definizione stringa da comporre prima di
inviare alla macchina
2025-06-26 18:32:34 +02:00
Samuele Locatelli b15917bfe2 Merge branch 'release/UpdateDataConfSdk_01' 2025-06-26 18:32:12 +02:00
Samuele Locatelli 844fb09964 Update struttura dataConf x SDK delle variabili con ricalcolo pre scrittura 2025-06-26 18:31:30 +02:00
Samuele Locatelli d1eda95b34 Merge tag 'UpdateRedisConf_02' into develop
Fix deploy su IIS03 --> Release x usare webconfig corretto
2025-06-10 12:59:26 +02:00
Samuele Locatelli 1754a5e590 Merge branch 'release/UpdateRedisConf_02' 2025-06-10 12:59:10 +02:00
Samuele Locatelli 7b1c2b0390 Refresh site x install su IIS03 con sistemazione yaml 2025-06-10 12:58:44 +02:00
Samuele Locatelli d669fdde97 Merge tag 'UpdateRedisConf_01' into develop
Update x gestione conf redis in release (DB 5 e localhost, al posto del
nostro sentinel...)
2025-06-09 18:39:27 +02:00
Samuele Locatelli dd5c626a8d Merge branch 'release/UpdateRedisConf_01' 2025-06-09 18:39:03 +02:00
Samuele Locatelli 7aa7c5429b Correzione config in release x fix redis su localhost e DB 5 2025-06-09 18:38:15 +02:00
Samuele Locatelli 81f5248ca4 Patch per fix lettura iniziale config in test ALIVE 2025-06-04 13:05:58 +02:00
Samuele Locatelli 05c4e91bbd Merge branch 'develop' into SDK 2025-05-29 16:09:23 +02:00
Samuele Locatelli 6d91a8a8e0 Update min/max double x objItems 2025-05-29 16:09:17 +02:00
Samuele Locatelli f8ffa10b6e Merge branch 'SDK' into develop 2025-05-29 14:46:48 +02:00
Samuele Locatelli 5e38362c89 modifica tipo valori min/max x permettere miglior filtraggio 2025-05-29 14:46:34 +02:00
Samuele Locatelli 758f3678e1 Merge branch 'SDK' into develop 2025-05-29 12:39:42 +02:00
Samuele Locatelli 15c66f0670 Reordeing plcMemMap 2025-05-29 12:39:32 +02:00
Samuele Locatelli c4956e5b63 Update definizione ed ordinamento VC 2025-05-29 12:38:34 +02:00
Samuele Locatelli 3e1c5e1942 Merge branch 'SDK' into develop 2025-05-29 09:00:34 +02:00
Samuele Locatelli 2f893db3e0 Merge branch 'master' into SDK 2025-05-29 09:00:19 +02:00
Samuele Locatelli a7d8ce1367 Merge tag 'SdkUpdate_01' into develop
Update parametri struttura params conf IOB
2025-05-29 08:59:53 +02:00
Samuele Locatelli 1e02e1a171 Merge branch 'release/SdkUpdate_01' 2025-05-29 08:59:40 +02:00
Samuele Locatelli 9bf8465536 SDK: aggiunto boolean x abilitazione invio parametri + threshold 2025-05-29 08:58:47 +02:00
Samuele Locatelli 57eda21415 update naming files + eliminazione file vecchio, typo 2025-05-29 08:58:28 +02:00
Samuele Locatelli a357bc5daa Merge tag 'FixNameFavicon_01' into develop
Aggiornamento nomi + favicon
2025-03-21 16:41:33 +01:00
Samuele Locatelli 9d51e94871 Merge branch 'release/FixNameFavicon_01' 2025-03-21 16:41:24 +01:00
Samuele Locatelli 8c063797e2 Update x nomi + favicon 2025-03-21 16:39:58 +01:00
Samuele Locatelli c71d373e44 Merge tag 'FixPaddingXdl_01' into develop
Aggiunta controllo pad zeri a 6 x ODL/PODL
2025-03-17 14:05:30 +01:00
Samuele Locatelli 32f826f027 Merge branch 'release/FixPaddingXdl_01' 2025-03-17 14:05:19 +01:00
Samuele Locatelli b8a4bdb8a5 Update x gestione padding a 6 zeri dati ODL/PODL 2025-03-17 13:36:53 +01:00
Samuele Locatelli 0cdec5b545 Merge tag 'FixAutoDossier_01' into develop
Fix x ricerca in cache redis Dossier già processati
2025-03-11 16:18:42 +01:00
Samuele Locatelli 89d03317e7 Merge branch 'release/FixAutoDossier_01' 2025-03-11 16:18:15 +01:00
Samuele Locatelli 9ef4349380 Fix create MAX ADD Auto Dossiers 2025-03-11 15:54:13 +01:00
Samuele Locatelli 48d868d58d Update gestione creazione FluxLog automatici 2025-03-11 15:41:30 +01:00
Samuele Locatelli 369d5629fb Merge tag 'AddKeepAliveOnEnabled_01' into develop
Aggiun ta record watchdog su controllo enabled IOB x evitare C101
2025-03-04 08:14:40 +01:00
Samuele Locatelli 4ae649c821 Merge branch 'release/AddKeepAliveOnEnabled_01' 2025-03-04 08:11:55 +01:00
Samuele Locatelli 8e14f689c5 Aggiunta scrittura keepalive su check enabled IOB 2025-03-04 08:11:21 +01:00
Samuele Locatelli 95f091e47f Merge tag 'UpdateStoredAndReboot_01' into develop
Update stored + reboot
2025-02-24 16:41:39 +01:00
Samuele Locatelli 084e84d639 Merge branch 'release/UpdateStoredAndReboot_01' 2025-02-24 16:41:31 +01:00
Samuele Locatelli ce8c5ba23e Update metodo lettura reboot 2025-02-24 16:40:40 +01:00
Samuele Locatelli 0e646b1d6f Update stored AutoODL 2025-02-24 11:40:02 +01:00
Samuele Locatelli 3147edb63a Merge tag 'FixAutoOdlConfTime_01' into develop
Update rallentamento gestione autoODL
2025-02-19 12:37:22 +01:00
Samuele Locatelli cc0ef384fa Merge branch 'release/FixAutoOdlConfTime_01' 2025-02-19 12:18:39 +01:00
Samuele Locatelli a7bfc78395 Fix ritardo autoOdl x evitare problemi conferme non prese da sim in ufficio (clock drift IIS/SQL) 2025-02-19 12:11:15 +01:00
Samuele Locatelli 760c2633f0 Merge tag 'AddFluxDataDb_01' into develop
Aggiunta connString + gestione x nuovo DB fluxLog e gestione dati
energia (da completare)
2025-02-10 10:12:58 +01:00
Samuele Locatelli 4876d7236b Merge branch 'release/AddFluxDataDb_01' 2025-02-10 10:11:38 +01:00
Samuele Locatelli fb354fecb8 Aggiunta conf x nuovo DB FluxData 2025-02-10 10:10:58 +01:00
Samuele Locatelli 94e53ebf62 Merge tag 'MpIoAddPodlFunc01' into develop
Aggiunta metodi x PODL e elenchi in creazione dati x ricette
2024-11-28 12:10:04 +01:00
Samuele Locatelli 366a501c4f Merge branch 'release/MpIoAddPodlFunc01' 2024-11-28 12:09:39 +01:00
Samuele Locatelli 9c7585b86f Typo 2024-11-28 12:09:00 +01:00
Samuele Locatelli f4aee79d60 Typo reordering codice 2024-11-28 12:03:40 +01:00
Samuele Locatelli fa3e9a8273 Aggiunbti nuovi metodi x gestioen PODL running/Act e inizio deprecate curr (che è NEXT...) 2024-11-28 12:01:19 +01:00
Samuele Locatelli 22a6b8e74e Merge tag 'AddArtComNum01' into develop
Fix gestione calcolo numeri x ART e COMMESSE
2024-11-06 17:28:11 +01:00
Samuele Locatelli 3c214ced3c Merge branch 'release/AddArtComNum01' 2024-11-06 17:27:59 +01:00
Samuele Locatelli 96a7e86517 Merge commit '01ef2fed20987c4eb49668cc5f94dcb65e623c17' into SDK 2024-11-05 18:51:09 +01:00
Samuele Locatelli 01ef2fed20 Aggiunta nuovi taskType x setArtNum e setCommNum da usare in IOB 2024-11-05 18:50:56 +01:00
Samuele Locatelli d167e1d7d4 MP-IO
- aggiunta metodo x gestione ODL/PODL numerico da scrivere
2024-11-05 17:15:31 +01:00
Samuele Locatelli 716d5238bc Completo gestione lato IO + DB x art numerici 2024-11-04 20:13:28 +01:00
Samuele Locatelli 3e9efd5190 Aggiunta tab gestione decodifica NumArt 2024-11-04 19:35:02 +01:00
Samuele Locatelli ec8a36f554 Merge tag 'MpIoAddNewCall01' into develop
Aggiunta metodi x nuove call in MP-IO x salvataggio conf IOB/Macchina
2024-10-14 16:01:58 +02:00
Samuele Locatelli bc78b4a2e9 Merge branch 'release/MpIoAddNewCall01' 2024-10-14 16:01:40 +02:00
Samuele Locatelli 5ac070a292 MP-IO
- aggiunta metodo salvataggio HASH table x MachineIobConf
- bozza x gestire dati opzionali IOB+Macchina
- typo fix vary
2024-10-14 16:01:09 +02:00
Samuele Locatelli 2a73c79eff Merge tag 'FixYamlCICD_2024.09.03' into develop
YAML di CI/CD: fix nuget setup preliminare
2024-09-03 15:34:24 +02:00
Samuele Locatelli 5a334d2fe7 Merge branch 'release/FixYamlCICD_2024.09.03' 2024-09-03 15:34:07 +02:00
Samuele Locatelli 487426ca44 Update yaml x CI/CD di nuget fix 2024-09-03 15:33:08 +02:00
Samuele Locatelli 5905b1d873 Merge tag 'UpdateNuget_2024.09' into develop
Aggiunta gestione LUT x semaforo stati ed opr, update massimo nuget a
2024.09
2024-09-03 15:31:24 +02:00
Samuele Locatelli 68e149713f Merge branch 'release/UpdateNuget_2024.09' 2024-09-03 15:31:07 +02:00
Samuele Locatelli 3aa1e87b5c Nuget fix/update:
- Microsoft --> 8.x
- EF 6
2024-09-03 15:30:42 +02:00
Samuele Locatelli 75f24240f3 Nuget fix/update:
- jquery
- bootstrap
2024-09-03 15:23:51 +02:00
Samuele Locatelli 1604814066 Nuget fix/update:
- Microsoft.AspNet.*
- Redis.*
2024-09-03 14:42:21 +02:00
Samuele Locatelli 99327ac077 Nuget fix/update:
- System*
2024-09-03 13:38:28 +02:00
Samuele Locatelli 054e987bc4 Nuget fix/update:
- NLog
- DnsClient
2024-09-03 13:09:42 +02:00
Samuele Locatelli 2be431182e Nuget fix/update:
- crc32.net
- SteamWare libs (all)
- SharpCompress/SharpZipLib
2024-09-03 12:42:03 +02:00
Samuele Locatelli 2d573f8a95 Aggiunta LUT stati semaforo in RAM 2024-09-03 12:20:53 +02:00
Samuele Locatelli 08b67c9784 Update x gestioen reset TabInCache a tempo 2024-09-03 11:44:40 +02:00
Samuele Locatelli d9d4af59fc Merge tag 'CheckResetMatr2Opr01' into develop
Test e fix reset operatore da amtricola
2024-08-19 19:18:44 +02:00
Samuele Locatelli c0911c47f5 Merge branch 'release/CheckResetMatr2Opr01' 2024-08-19 19:18:28 +02:00
Samuele Locatelli 5c22d0d977 Fix reload matricola --> operatore 2024-08-19 19:17:50 +02:00
Samuele Locatelli 78b316a645 Merge tag 'FixAziendaSelector01' into develop
Fix gestione selettore azienda da config
2024-07-31 15:03:04 +02:00
Samuele Locatelli 9deb555310 Merge branch 'release/FixAziendaSelector01' 2024-07-31 15:02:50 +02:00
Samuele Locatelli db2ff3409f Fix tag azienda UPPERCASE 2024-07-31 14:47:55 +02:00
Samuele Locatelli 259dc2fac4 Merge tag 'AddMpIoAppConfRedis01' into develop
Gestione conf di default di MP-IO con area Redis impostata correttamente
su DB1 in localhost + porte std
2024-05-10 12:03:21 +02:00
Samuele Locatelli 5bfb9e0bc0 Merge branch 'release/AddMpIoAppConfRedis01' 2024-05-10 12:02:48 +02:00
Samuele Locatelli 1fb20243eb Fix config x MP/IO in release (prod) 2024-05-10 12:02:17 +02:00
Samuele Locatelli 4a34b34ddf Merge tag 'AddPodlSuDP' into develop
Fix condizione doppio tavola selezionabile in PODL
2024-04-15 09:40:00 +02:00
Samuele Locatelli 15ed840e23 Merge branch 'release/AddPodlSuDP' 2024-04-15 09:39:46 +02:00
Samuele Locatelli 5e27aff6b7 ADM:
- modifica show elenco macchine
- condizione vista tavole da tab config e non da interfaccia
2024-04-15 09:38:43 +02:00
Samuele Locatelli bbac335692 Merge tag 'MpIoAddConfOdlAndPz01' into develop
Aggiunta metodo conf ODL daily + conf Pz prod x TFT
2024-04-02 09:22:56 +02:00
Samuele Locatelli d2b2072c9e Merge branch 'release/MpIoAddConfOdlAndPz01' 2024-04-02 09:22:41 +02:00
Samuele Locatelli c593135afc MP-IO:
- aggiunta chiamata fixDailyOdlConfPzCount x creazione ODL daily + conf pz prod
2024-04-02 09:21:52 +02:00
Samuele Locatelli 5b05ab34a1 Merge tag 'ReplaceIis02Iis03_01' into develop
Update iis02 --> iis03 e test installazione
2024-03-22 10:11:35 +01:00
Samuele Locatelli 4d597aa1ba Merge branch 'release/ReplaceIis02Iis03_01' 2024-03-22 10:11:24 +01:00
Samuele Locatelli 3fd0f34cba COmpletato cleanup IIS02 2024-03-22 10:06:30 +01:00
Samuele Locatelli 6489aba1d0 update gitignore 2024-03-22 09:54:40 +01:00
Samuele Locatelli 2218000d33 scambio IIS02/03 x
- ADM
- IO
- MAG
- SITE
- TAB
2024-03-22 09:53:22 +01:00
Samuele Locatelli c8076122ef Inizio update iis02/iis03 x deploy CI/CD + pulizia jenkinsfile 2024-03-22 09:48:29 +01:00
Samuele Locatelli c3a76f7531 Merge tag 'UpdateRedisSentinel04' into develop
Fix gestione DB 1-->5
2024-03-18 18:23:56 +01:00
Samuele Locatelli 84e9d0a846 Merge branch 'release/UpdateRedisSentinel04' 2024-03-18 18:23:43 +01:00
Samuele Locatelli aa9d5d21d5 Fix redis DB 1--> 5 2024-03-18 18:15:14 +01:00
Samuele Locatelli 4502fea662 Update x gestione Redis Sentinel 2024-03-18 17:55:56 +01:00
Samuele Locatelli bbdf644d5e Merge tag 'FixAutoOdl_ConfScarti01' into develop
Fix gestione conferma scarti x AutoODL
2024-02-27 12:06:02 +01:00
Samuele Locatelli deff8c8cb6 Merge branch 'release/FixAutoOdl_ConfScarti01' 2024-02-27 12:05:32 +01:00
Samuele Locatelli b375bc95b4 Fix procedura AutoODL: confermati scarti! 2024-02-27 12:05:01 +01:00
Samuele Locatelli ba64a8d86f Merge tag 'FixTabDurataAndDisplay' into develop
Fix tabled:
- durata in giorni
- display ore in home mappaStato
2024-02-06 09:41:02 +01:00
Samuele Locatelli 8125b1249a Merge branch 'release/FixTabDurataAndDisplay' 2024-02-06 09:40:46 +01:00
Samuele Locatelli 1c7919d8af Fix display mappa stato (ore durata) 2024-02-06 09:40:17 +01:00
Samuele Locatelli 675f2b6013 Fix calcolo num gg fermate (prende solo gg interi altrimenti ne conta +1) 2024-02-05 19:11:23 +01:00
Samuele Locatelli 850a23bdb7 Update gestione promesse ODL: vietato singole tavole 2023-12-18 18:12:26 +01:00
Samuele Locatelli 5ea5fc46b2 Cambio porta TAB: 44384 -> 44484 2023-12-11 18:27:35 +01:00
Samuele Locatelli 7553e80e7f update insomnia test 2023-12-09 12:07:45 +01:00
Samuele Locatelli 4336c6c8a2 Merge tag 'FixArtGetPaged01' into develop
Fix try/catch gestione lettura articoli
2023-11-20 18:11:54 +01:00
Samuele Locatelli b61fe81546 Merge branch 'release/FixArtGetPaged01' 2023-11-20 18:11:46 +01:00
Samuele Locatelli bfa46056fb Aggiunto try-catch x errore chaive articoli 2023-11-20 18:11:07 +01:00
Samuele Locatelli ff04d7a366 Merge tag 'FixPodlLiveCreate01' into develop
Fix creazione PODL (ex soitaab)
2023-11-20 12:12:10 +01:00
Samuele Locatelli b00ba310da Merge branch 'release/FixPodlLiveCreate01' 2023-11-20 12:12:02 +01:00
Samuele Locatelli b3e1f66114 Fix creazione POdl x soitaab 2023-11-20 12:11:37 +01:00
Samuele Locatelli d0ecb01be1 Fix grafico sel gest promODL da ADM 2023-11-13 18:46:55 +01:00
Samuele Locatelli 8299c38654 ADM: Update gest PODL x valori decimali 2023-11-09 10:09:30 +01:00
Samuele Locatelli 08ade40ff8 Verifica parametro confermaPzProd su slave machine 2023-11-06 10:36:21 +01:00
Samuele Locatelli a3369aabb1 Merge tag 'MpIoAddPodl03' into develop
Fix metodo incremento contapezzi alla data
2023-11-04 09:37:47 +01:00
Samuele Locatelli 87713c0ac4 Merge branch 'release/MpIoAddPodl03' 2023-11-04 09:37:27 +01:00
Samuele Locatelli 64d40e5426 Fix gestione invio pezzi al passato 2023-11-03 18:56:47 +01:00
Samuele Locatelli 492c0561c7 Merge tag 'MpIoAddPodl02' into develop
Fix gestione nuovi ART in ADM
2023-11-03 15:38:10 +01:00
Samuele Locatelli 0ddffd7969 Merge branch 'release/MpIoAddPodl02' 2023-11-03 15:38:02 +01:00
Samuele Locatelli e294cd4eb0 Fix ADM gest nuovi articoli 2023-11-03 15:37:43 +01:00
Samuele Locatelli 551e2c1013 Merge tag 'MpIoAddPodl01' into develop
Aggiunta metodi x gestione creazione PODL e articoli
2023-11-03 15:34:03 +01:00
Samuele Locatelli f6135d8142 Merge branch 'release/MpIoAddPodl01' 2023-11-03 15:33:50 +01:00
Samuele Locatelli e59268e03d Completato fix gestione creazione PODL con add Articolo 2023-11-03 15:30:52 +01:00
Samuele Locatelli 66e5d20db5 Aggiunta IO metodi x gestione PODL estesa 2023-11-03 12:40:04 +01:00
Samuele Locatelli 513e2d7728 Typo lemma senza <h2> x ODL 2023-10-31 11:11:56 +01:00
Samuele Locatelli 04849303d3 Merge tag 'TabAddFixAlarm01' into develop
Fix filtro macchina x elenco allarmi
2023-10-16 11:50:18 +02:00
Samuele Locatelli 42411152bd Merge branch 'release/TabAddFixAlarm01' 2023-10-16 11:49:55 +02:00
Samuele Locatelli 81494b1d4f TAB:
- fix selezione allarmi macchina
2023-10-16 11:48:48 +02:00
Samuele Locatelli 2ad1dbc1f7 Merge tag 'AddMpIoMethods01' into develop
Aggiunta metodi x gestione contapezzi ODL
2023-10-13 19:11:54 +02:00
Samuele Locatelli a559aedccd Merge branch 'release/AddMpIoMethods01' 2023-10-13 19:11:41 +02:00
Samuele Locatelli d78a8bc772 Update modalità conferma prod x macchine SLAVE al cambio ODL 2023-10-13 18:51:54 +02:00
Samuele Locatelli 91f5754a79 Update MP-IO x metodo conteggio pz ODL 2023-10-13 18:34:47 +02:00
Samuele Locatelli 3a13b76bae Merge tag 'FixSavePzCountMulti01' into develop
Fix gestione contapezzi x macchine multi
2023-10-05 17:45:11 +02:00
Samuele Locatelli ca02fa0ef8 Merge branch 'release/FixSavePzCountMulti01' 2023-10-05 17:44:48 +02:00
Samuele Locatelli 86adbf8a1e Fix dichiarazione contapezzi x macchine MULTI 2023-10-05 17:44:19 +02:00
Samuele Locatelli 8a92c5da8b Merge tag 'FixTabConfProd' into develop
Fix colore testo in conferma prod
2023-10-04 16:18:10 +02:00
Samuele Locatelli 10ff165f07 Merge branch 'release/FixTabConfProd' 2023-10-04 16:18:02 +02:00
Samuele Locatelli 90dbc25bb2 fix testo bianco sfondo nero conf prod 2023-10-04 14:19:06 +02:00
Samuele Locatelli 27a23e0487 Tolto jqueryUI da TAB 2023-09-25 09:42:32 +02:00
Samuele Locatelli 5bd72d4d52 Merge branch 'master' into develop 2023-09-22 09:47:53 +02:00
Samuele Locatelli 304dd7c755 Merge tag 'UpdateTabParametri04' into develop
Fix vari x test invio parametri
2023-09-22 09:47:41 +02:00
Samuele Locatelli f53267a39a Fix display versione data x parametri 2023-09-22 09:47:24 +02:00
Samuele Locatelli d14fb28c38 Merge branch 'release/UpdateTabParametri04' 2023-09-22 09:46:17 +02:00
Samuele Locatelli 4305997c5f Fix boundle + master 2023-09-22 09:45:11 +02:00
Samuele Locatelli a661cae21a TAB:
- nuova master da base x scanner QR
- fix lettura js
- rimesso jqueryUI
- fix pagina dettaglio x disegni gestiti o meno
2023-09-22 09:43:43 +02:00
Samuele Locatelli 1e7d9dcc35 Update x img piccole 2023-09-21 19:27:16 +02:00
Samuele Locatelli e88639e08e Refresh sidebar offcanvas 2023-09-21 19:09:27 +02:00
Samuele Locatelli 097c9d7a27 TAB:
- fix grafico pagine (layout main)
- fix header/footer
2023-09-21 18:54:47 +02:00
Samuele Locatelli 09fa828634 Merge tag 'UpdateTabParametri03' into develop
Update per TAB senza jqueryUI/js vari
2023-09-21 10:55:28 +02:00
Samuele Locatelli 86c4d0f029 Merge branch 'release/UpdateTabParametri03' 2023-09-21 10:55:12 +02:00
Samuele Locatelli ac8d477185 Merge branch 'develop' into SDK 2023-09-21 10:53:45 +02:00
Samuele Locatelli a62e412a64 Fix deploy key x SDK 2023-09-21 10:53:17 +02:00
Samuele Locatelli 2a01c5b93a AB: eliminazione js/css inutilizzati:
- modernizr
- jquery
- jqueriui
2023-09-21 08:03:16 +02:00
Samuele Locatelli e4d061f6cd TAB: fix send parameters refresh 2023-09-21 08:02:14 +02:00
Samuele Locatelli d9902e7f5e Merge tag 'UpdateTabParametri02' into develop
Update compilazione x TAB con LOG
2023-09-20 17:22:34 +02:00
Samuele Locatelli f091ad4ab2 Merge branch 'release/UpdateTabParametri02' 2023-09-20 17:22:26 +02:00
Samuele Locatelli accb74fe20 Update con LOG x salvataggio aprametri TAB 2023-09-20 14:22:35 +02:00
Samuele Locatelli 5e4564c046 Merge tag 'UpdateTabParametri01' into develop
Update gestione TAB
2023-09-19 11:21:01 +02:00
Samuele Locatelli 4967d89534 Merge branch 'release/UpdateTabParametri01' 2023-09-19 11:20:55 +02:00
Samuele Locatelli f83ff05bf5 Fix puntamento icone TAB 2023-09-19 09:23:24 +02:00
Samuele Locatelli 903584508f Update TAB:
- rimosse librerie jscript inutilizzate
- rivista procedura x sendParameters
2023-09-19 09:13:45 +02:00
Samuele Locatelli 0c18a85f1a Update icone 2023-09-19 09:13:30 +02:00
Samuele Locatelli 26c289b986 Merge branch 'develop' into SDK 2023-09-19 08:32:29 +02:00
Samuele Locatelli df1245368a Update parametro x ordinamento obj 2023-09-19 08:32:21 +02:00
Samuele Emilio Locatelli b85b440d77 Merge branch 'develop' into 'SDK'
SDK update from develop

See merge request egalware-web/mes/mapo/MoonPro.net!1
2023-09-16 08:59:41 +00:00
Samuele Emilio Locatelli b1efbc31c0 Update .gitlab-ci.yml file: fix variable explosion in pack/push stage 2023-09-16 08:51:49 +00:00
Samuele Locatelli 21a900c3a2 Merge branch 'SDK' into develop 2023-09-16 10:35:16 +02:00
Samuele Locatelli d2a7cb8525 Fix dataconf 2023-09-16 10:35:12 +02:00
Samuele Locatelli 9190d37b1b fix yaml x SDK 2023-09-16 10:10:46 +02:00
Samuele Locatelli da9f9171d6 Merge branch 'develop' into SDK 2023-09-16 10:01:49 +02:00
Samuele Locatelli cd6b76fc4a Aggiunto display order per mem PLC 2023-09-16 10:01:34 +02:00
Samuele Locatelli 5f85d15dac Merge tag 'UpdateNugetAll02' into develop
Fix about page in TAB
2023-09-14 08:16:36 +02:00
Samuele Locatelli 1e16060463 Merge branch 'release/UpdateNugetAll02' 2023-09-14 08:16:26 +02:00
Samuele Locatelli f5b8412957 Fix aboutpage tab (minor) 2023-09-14 08:16:07 +02:00
Samuele Locatelli fe37a476ee Merge tag 'UpdateNugetAll01' into develop
Aggiornamento componenti nuget vari e update generalizzato a Bootstrap5
dei siti
2023-09-14 07:53:22 +02:00
Samuele Locatelli fb698183db Merge branch 'release/UpdateNugetAll01' 2023-09-14 07:52:52 +02:00
Samuele Locatelli 6d7d7ec6dd All sites
- ancora nuget update vari
- componenti MVC x IO e MAG
2023-09-14 07:52:24 +02:00
Samuele Locatelli 80e0ebbdeb All sites:
- Nuget update x steamwarelib
- consolidate json
- bootstrap5 -->5.3
2023-09-13 18:17:50 +02:00
Samuele Locatelli 74407fe4a3 MP-MAG:
- completato update a B5
- fix vari
2023-09-13 15:38:45 +02:00
Samuele Locatelli 2fc23e7d47 Ancora fix tablet x data-ora 2023-09-13 15:07:08 +02:00
Samuele Locatelli cb7247f86a Refresh MAG 2023-09-13 14:50:03 +02:00
Samuele Locatelli 696b307241 Update display dataora tablet 2023-09-13 14:50:02 +02:00
Samuele Locatelli 659beaeb29 Continuo fix MAG 2023-09-13 14:12:33 +02:00
Samuele Locatelli c62eb3f107 Update Tab x dichiarazione 2023-09-13 14:12:22 +02:00
Samuele Locatelli 315fea9858 update steamwarelibs 2023-09-13 11:34:38 +02:00
Samuele Locatelli 4e3a12007a MAG:
- sostituzione Nlog.Log x DataLayer
- update grafici + test vari
2023-09-13 08:53:23 +02:00
Samuele Locatelli c3d07f626c MAG
- fix preliminari B5
2023-09-13 08:32:55 +02:00
Samuele Locatelli 3b0d0878c9 Last fix SITE 2023-09-13 07:32:47 +02:00
Samuele Locatelli e1ebe72eac fix spacing vert 2023-09-12 19:48:58 +02:00
Samuele Locatelli 572c2baf48 Ancora ottimizzazioni pagina 2023-09-12 19:48:05 +02:00
Samuele Locatelli a0015ed4c6 Completata review SITE! 2023-09-12 19:39:36 +02:00
Samuele Locatelli c3693bef4e Continu fix con padding vari 2023-09-12 19:19:42 +02:00
Samuele Locatelli 3dd4d8c912 Continuo fix B5 x MP-SITE 2023-09-12 19:04:38 +02:00
Samuele Locatelli 252d7aaae5 Inizio modifica componente periodo x MP-SITE 2023-09-12 17:42:12 +02:00
Samuele Locatelli 435ba08d39 Inizio modifica MP-SITE 2023-09-12 17:07:51 +02:00
Samuele Locatelli 895c0db711 COmpletata review TAB post update 2023-09-12 08:46:43 +02:00
Samuele Locatelli 65d219dee9 TAB
- update parziale bootstrap5
2023-09-11 19:42:45 +02:00
Samuele Locatelli 61028fb668 MP-ADM
- porting Bootstrap4 --> bootstrap5
- vari fix (es search vocabolario)
2023-09-11 18:35:10 +02:00
Samuele Locatelli 23f557b0bc Ancora update nuget:
- scriptmanager.jquery
- scriptmanager.bootstrap
- bootstrap
2023-09-11 16:30:15 +02:00
Samuele Locatelli 2ad36f88e7 update csproj 2023-09-11 16:22:43 +02:00
Samuele Locatelli 7b7db98f20 Update nuget vari x consolidamento 2023-09-11 16:13:01 +02:00
Samuele Locatelli bc2fdf2f34 TAB:
- update microstato amcchina su dichiarazione utente
2023-09-11 15:43:33 +02:00
Samuele Locatelli ae192145df Merge tag 'TestFixCercaCommessaStati01' into develop
Tentativo fix ricerca periodo commessa con 1 sec arrotondamento
2023-05-17 11:32:21 +02:00
Samuele Locatelli 8b2652b283 Merge branch 'release/TestFixCercaCommessaStati01' 2023-05-17 11:32:00 +02:00
Samuele Locatelli 0b4e82ccb1 Fix ricerca commessa cona rrotondamento 2023-05-17 11:31:29 +02:00
Samuele Locatelli d85a5a234f Merge tag 'UpdateSiterefresh' into develop
Update MSE SITE
2023-05-09 10:04:02 +02:00
Samuele Locatelli dbec66d769 Merge branch 'release/UpdateSiterefresh' 2023-05-09 10:03:34 +02:00
Samuele Locatelli cf26f4c1c3 Fix: ritorno a MSE 2023-05-04 15:53:27 +02:00
Samuele Locatelli fe0b742281 MP-STATS:
Spostamento funzione calcolo stato da MSE a resoconti
2023-05-04 15:40:15 +02:00
Samuele Locatelli a0c234acc4 Ancora update MP-SITE 2023-05-04 15:09:56 +02:00
Samuele Locatelli 676a495124 Cache tab stati (durata) a 5 sec 2023-05-04 15:05:35 +02:00
Samuele Locatelli 56bf45d9fe Merge tag 'UpdatereportStatiCommesse02' into develop
update x gestione nuova cache x MappaStato di MP-SITE
2023-05-03 16:49:08 +02:00
Samuele Locatelli 7a68fb6acf Merge branch 'release/UpdatereportStatiCommesse02' 2023-05-03 16:48:58 +02:00
Samuele Locatelli ad54626f47 MP-SITE:
- Update cache dati mappaStato
2023-05-03 16:48:16 +02:00
Samuele Locatelli f7f13ab22c Merge tag 'UpdatereportStatiCommesse01' into develop
Update x export commesse in log stati
2023-05-03 15:49:24 +02:00
Samuele Locatelli bc19b86185 Merge branch 'release/UpdatereportStatiCommesse01' 2023-05-03 15:49:14 +02:00
Samuele Locatelli 6b8c123bdf Typo: code reorg 2023-05-03 15:49:04 +02:00
Samuele Locatelli 33791b17a7 Update export commesse 2023-05-03 15:15:51 +02:00
Samuele Locatelli 3c0d436067 Merge tag 'FixRestProcOtherInfo' into develop
Fix gestione redis x comandi procInfo
2023-04-12 12:35:54 +02:00
Samuele Locatelli 390d65e456 Merge branch 'release/FixRestProcOtherInfo' 2023-04-12 12:35:27 +02:00
Samuele Locatelli 1e5e29b2dd Merge branch 'SDK' into develop 2023-04-12 10:12:00 +02:00
Samuele Locatelli 3e1a7faf8d MP-IO:
- Cambio destinazione area REDIS
- update REST conf test
2023-04-12 10:11:52 +02:00
Samuele Locatelli a60f29849f Merge branch 'develop' into SDK 2023-04-12 09:59:29 +02:00
Samuele Locatelli 466308c5b4 Merge tag 'AddOtherInfoProc' into develop
Processing other info
2023-04-12 09:59:18 +02:00
Samuele Locatelli 6133517eb3 Merge branch 'release/AddOtherInfoProc' 2023-04-12 09:57:43 +02:00
Samuele Locatelli 5a1713c88b Aggiunta enum task x process other info (ricette fimat) 2023-04-12 09:57:14 +02:00
Samuele Locatelli 0fe673e0fe MP-IO:
- salvataggio current INFO da IOB via chiamata su redis cache
2023-04-12 09:21:19 +02:00
Samuele Locatelli d645bce02b MP-IO:
- correzione metodi gestione apertura/chiusura nuovo PODL
2023-04-11 11:42:46 +02:00
Samuele Locatelli 8063e5f07b Merge tag 'FixClosePodlAtTime01' into develop
Aggiunta possibilità chiusura PODL a specifica data-ora
2023-04-07 19:20:09 +02:00
Samuele Locatelli 36e32df462 Merge branch 'release/FixClosePodlAtTime01' 2023-04-07 19:19:44 +02:00
Samuele Locatelli ea0fd00c50 update metodo x chiusura PODL a tempo specificato 2023-04-07 19:19:15 +02:00
Samuele Locatelli eb7a4a6c2b Merge tag 'AddIobOpenPOdlFimat' into develop
Aggiunta chiusura forzata PODL a posteriori (es FIMAT)
2023-03-24 18:54:42 +01:00
Samuele Locatelli 254f5dace0 Merge branch 'release/AddIobOpenPOdlFimat' 2023-03-24 18:54:23 +01:00
Samuele Locatelli 216ca98f7e CodeMaid x DataLayer e controller IOB 2023-03-24 18:53:50 +01:00
Samuele Locatelli f88ccf4bfa Aggiunta metodi x avvio PODL passati 2023-03-24 18:20:46 +01:00
Samuele Locatelli 4cf98efc21 Aggiunta icona fermata 50 2023-03-20 08:34:32 +01:00
Samuele Locatelli 0be4cf8506 Merge tag 'fixYamlDash' into develop
fix yaml x errore trattito formattazione data
2023-03-17 17:20:46 +01:00
Samuele Locatelli abf498609b Merge branch 'release/fixYamlDash' 2023-03-17 17:20:37 +01:00
Samuele Locatelli 5ecd170370 fix yaml trattino 2023-03-17 17:19:25 +01:00
Samuele Locatelli 714abc075f Merge tag 'AddPodlWithOdlDisplay' into develop
Update per mostrare PODL/ODL
2023-03-17 17:00:50 +01:00
Samuele Locatelli 0aacf0e863 Merge branch 'release/AddPodlWithOdlDisplay' 2023-03-17 17:00:29 +01:00
Samuele Locatelli 71d4b8a9b7 Update ADM 2023-03-17 16:59:45 +01:00
Samuele Locatelli d4c336e253 Update SITE x PODL/ODL 2023-03-17 16:53:00 +01:00
Samuele Locatelli 3bdea39b87 Update dettaglio macchina 2023-03-17 16:27:38 +01:00
Samuele Locatelli c04b72c855 Aggiunta PODL in tablet main 2023-03-17 16:22:07 +01:00
Samuele Locatelli 826e8e8934 Aggiunto metodo x chiusura diretta PODL 2023-03-17 15:14:40 +01:00
Samuele Locatelli 5f35a7294f MP-IO:
- aggiunta metodo x recupero PODL
2023-03-17 15:05:39 +01:00
Samuele Locatelli 8c9c0fe897 Merge tag 'UpdateStartProdSlave' into develop
Aggiunta start produzione x Slave machine (es Valvital)
2023-01-17 12:17:49 +01:00
Samuele Locatelli 814a7331f8 Merge branch 'release/UpdateStartProdSlave' 2023-01-17 12:11:40 +01:00
Samuele Locatelli 56a7e02c50 Start produzione:
- machcine slave ricevono start produzione (es valvital)
2023-01-17 12:11:13 +01:00
Samuele Locatelli 38a20c2a48 Merge tag 'FixSnapshotDailyAndCodeCleanupMapoDb' into develop
Fix calcolo data dossier + codeMaid generale MapoDb
2022-12-21 15:15:41 +01:00
Samuele Locatelli 78012442f7 Merge branch 'release/FixSnapshotDailyAndCodeCleanupMapoDb' 2022-12-21 15:11:34 +01:00
Samuele Locatelli 32fb68fa68 CodeMaid:
- Cleanup codice area MapoDb
2022-12-21 15:11:04 +01:00
Samuele Locatelli 21a86c0bf0 Fix metodo creazione dossier x data alla mezzanotte 2022-12-21 15:07:53 +01:00
Samuele Locatelli 072145917d Merge tag 'AddDossierDailyCreationCall' into develop
Aggiunta call x creazione dossier quotidiani
2022-12-21 10:16:05 +01:00
Samuele Locatelli 9f2cbf51c6 Merge branch 'release/AddDossierDailyCreationCall' 2022-12-21 10:15:48 +01:00
Samuele Locatelli 23361257c3 MP-IO --> CodeMaid
- refactoring controller IOB
- refactoring datalayer
2022-12-21 09:58:51 +01:00
Samuele Locatelli 83d2f69f19 MP-IO:
- Update IOB x  metodi generazione automatica dossier quotidiani
2022-12-21 09:57:34 +01:00
Samuele Locatelli 4c966d68bf Merge tag 'InsomniaRefreshAskCloseOdl' into develop
Aggiunto nuovo tracciato insomnia
2022-12-09 19:41:38 +01:00
Samuele Locatelli cd59fd0f80 Merge branch 'release/InsomniaRefreshAskCloseOdl' 2022-12-09 19:41:14 +01:00
Samuele Locatelli 204381393e Add rest update x insomnia 2022-12-09 19:40:46 +01:00
Samuele Locatelli f4a392cc53 Merge tag 'AddRedisMEssagePipe' into develop
Aggiunto e testato in locale metodo askCloseODL
2022-12-09 19:40:14 +01:00
Samuele Locatelli 7bd9e1c363 Merge branch 'release/AddRedisMEssagePipe' 2022-12-09 19:39:38 +01:00
Samuele Locatelli ed7ffa7d22 Completato metodo MP-IO x invio messaggio update! 2022-12-09 19:39:13 +01:00
Samuele Locatelli 3162608d82 MP-IO :
- aggiunta metodo x chiamate richiesta chiusura ODL (preliminare)
2022-12-09 19:01:44 +01:00
Samuele Locatelli c17c20b648 MP-IO & MapoDB:
- modifica DataLayer x gestione diretta redis x chiamate da channel e salvataggio in cache
2022-12-09 19:00:45 +01:00
Samuele Locatelli c24ca4a3c2 MP-IO & MapoDB:
- aggiunta classi base x DisplayAction
- Aggiunta Message Pipe class
2022-12-09 19:00:35 +01:00
Samuele Locatelli ef6e470977 Merge branch 'develop' into SDK 2022-11-30 16:07:19 +01:00
Samuele Locatelli d40239f60c UPdate modello dati RegGiac 2022-11-30 16:07:13 +01:00
Samuele Locatelli 5dc5af6d9d Merge branch 'develop' into SDK 2022-11-30 10:40:20 +01:00
Samuele Locatelli f8c5c392a6 Update conf REST insomnia 2022-11-29 19:02:37 +01:00
Samuele Locatelli edd6094c93 Merge tag 'AggiungaFixAutoOdl' into develop
Aggiuta metodo Auto ODL
2022-11-29 16:25:31 +01:00
Samuele Locatelli 1118c78ddf Merge branch 'release/AggiungaFixAutoOdl' 2022-11-29 16:23:57 +01:00
Samuele Locatelli f12e2f3f57 MP-IO:Aggiunta gestione fixAutoODL 2022-11-29 16:23:36 +01:00
Samuele Locatelli f88263daa9 Merge branch 'master' into develop 2022-11-29 11:47:05 +01:00
Samuele Locatelli 4d437374dd COmpletato import RegGIacenze (con test) 2022-11-29 11:46:54 +01:00
Samuele Locatelli 63545c6f3d OK ODL alla data 2022-11-29 09:45:27 +01:00
Samuele Locatelli 46ba6078e3 MP-IO:
- Inizio modifiche x nuova registrazione RegGiacenze
2022-11-28 19:58:30 +01:00
Samuele Locatelli a4f04749fb Merge branch 'develop' 2022-11-10 15:14:50 +01:00
Samuele Locatelli e9a7c525ce Update TAB
- gestione eccezione in caso di mancanza parametri in REDIS
2022-11-10 15:14:03 +01:00
Samuele Locatelli e67b45fee5 Merge tag 'AddMpIoForceStartPOdl' into develop
Aggiunta metodo force start PODL
2022-11-10 11:11:16 +01:00
Samuele Locatelli ef812b4762 Merge branch 'release/AddMpIoForceStartPOdl' 2022-11-10 11:11:04 +01:00
Samuele Locatelli 0a8a0f0eb2 Sviluppo ForceStartPOdl 2022-11-10 11:10:38 +01:00
Samuele Locatelli d0af9aa18f Merge tag 'AddInvioParamChiusuraOdl' into develop
Fix chiusura odl implicito da master (es valvital) - da testare
2022-10-28 17:02:43 +02:00
Samuele Locatelli 5e6ec5c21c Merge branch 'release/AddInvioParamChiusuraOdl' 2022-10-28 17:02:30 +02:00
Samuele Locatelli 19f6fdc735 Update metodi TAB x invio macvchine master/slave
- da testare in valvital
- dovrebbe evitare fix chiusura ODL
2022-10-28 17:02:05 +02:00
Samuele Locatelli 40663aee34 Merge tag 'addSnapshotFromIO' into develop
Aggiunta esecuzione snapshot da IOB-WIN --> IO
2022-10-10 10:44:52 +02:00
Samuele Locatelli 576f748404 Merge branch 'release/addSnapshotFromIO' 2022-10-10 10:44:30 +02:00
Samuele Locatelli 3db0a6dcf4 Aggiunta chaimata IO x takeSnapshot 2022-10-10 10:44:01 +02:00
Samuele Locatelli 57c3091759 update test insomnia 2022-10-10 10:43:53 +02:00
Samuele Locatelli 41033edf08 refresh controller x force close ODL 2022-10-08 17:48:17 +02:00
Samuele Locatelli e740cdc203 Merge tag 'MP_IO_AddListValSearch' into develop
Aggiunta metodo MP IO x elenco ListVal
2022-10-07 19:31:53 +02:00
Samuele Locatelli d5c46346d2 Merge branch 'release/MP_IO_AddListValSearch' 2022-10-07 19:31:35 +02:00
Samuele Locatelli 1738ac8506 Aggiunta metodo x recupero ListValue:
- es trad fasi PODL
2022-10-07 19:31:08 +02:00
Samuele Locatelli 0ce4622710 Merge tag 'AddSearchByMacch' into develop
Update metodi x recupero DOSS e ART ultimi lavorati o da PODL
2022-10-07 15:33:21 +02:00
Samuele Locatelli fc71cb0584 Merge branch 'release/AddSearchByMacch' 2022-10-07 15:32:57 +02:00
Samuele Locatelli 17abd4aec3 SyncDB (ex baglietto PODL)
- metodo recupero ULTIMI articoli x macchina
- metodo recupero ULTIMI dossier x macchina
2022-10-07 15:32:22 +02:00
Samuele Locatelli 9907ebfc6a Merge tag 'AddMpIoArtMethod' into develop
Aggiunta elenco articoli:
- correnti x PODL
- impiegati in ODL/PODL
2022-10-07 09:27:24 +02:00
Samuele Locatelli 146b1900fc Merge branch 'release/AddMpIoArtMethod' 2022-10-07 09:27:05 +02:00
Samuele Locatelli 40eb31638b Aggiunta metodi IO recupero articoli
- articoli USATI (OLD/PODL)
- articoli in PODL correnti
2022-10-07 09:26:39 +02:00
Samuele Locatelli de8eaa6fd7 Merge tag 'AddMpIoMethodForDossiers' into develop
Aggiunta metodi per gestione DOSSIERS e PODL relativi
2022-10-05 17:08:46 +02:00
Samuele Locatelli 9259bb0d0f Merge branch 'release/AddMpIoMethodForDossiers' 2022-10-05 17:08:31 +02:00
Samuele Locatelli 1d2fe958fe Update rest file x test nuovi metodi IO 2022-10-05 17:08:00 +02:00
Samuele Locatelli 473ae8cad9 MP-IO:
- Aggiunta nuovo dataset
- metodi IOB x get PODL e DOSSIER
2022-10-05 17:05:50 +02:00
Samuele Locatelli 11e3ef3db3 Gestione CIMOLAI:
- Inizio modifica IO x metodi dati PODL
- anag articoli
2022-10-05 16:07:35 +02:00
Samuele Locatelli ea6111dbd1 Merge tag 'FixDoubleSendTaskOdlTAB' into develop
Fix comportamento parte setup ODL
2022-09-30 12:46:08 +02:00
Samuele Locatelli afc0ab32e0 Merge branch 'release/FixDoubleSendTaskOdlTAB' 2022-09-30 12:45:58 +02:00
Samuele Locatelli 1543c8cc64 update comportamento salvataggio task2exe 2022-09-30 12:45:29 +02:00
Samuele Locatelli 7b362104a4 Merge branch 'develop' 2022-09-29 08:35:22 +02:00
Samuele Locatelli ab3ba0881e Update x gestione
- refresh dettaglio macchina
- gestione eventi disposed
2022-09-28 19:10:32 +02:00
Samuele Locatelli eaa0c73ec7 Merge tag 'FixConfermaAndOdlRefresh' into develop
Completato conferma Pezzi "bloccato" + refresh gestibilità attrezzaggio
in pag ODL
2022-09-28 18:20:40 +02:00
Samuele Locatelli 267b5f69f4 Merge branch 'release/FixConfermaAndOdlRefresh' 2022-09-28 18:20:21 +02:00
Samuele Locatelli b430d696e8 Aggiunto progress x componente top 2022-09-28 18:18:50 +02:00
Samuele Locatelli 15b87f2133 codemaid
- fix code org
2022-09-28 18:18:30 +02:00
Samuele Locatelli 09de731c88 Fix gesitone ODL con controllo ogni 10" pezzi
- aggiunto timer dtTimerOdlInt a 10'000ms
2022-09-28 18:10:17 +02:00
Samuele Locatelli 39f6cdd1f3 CodeMaid:
- reord codice
2022-09-28 17:50:19 +02:00
Samuele Locatelli 803a2103c9 Update TBA:
- fix pagina conferma
- NON si modifica se non si fa toggle mostra/nascondi conferma
- periodo indicato meglio
2022-09-28 17:49:33 +02:00
Samuele Locatelli 8ebbe0294c Merge tag 'SDK_updateObjItem' into develop
Update SDK x nuovo objItem e TAB di conseguenza
2022-09-22 18:58:18 +02:00
Samuele Locatelli 2e35fb6d0e Merge branch 'release/SDK_updateObjItem' 2022-09-22 18:57:53 +02:00
Samuele Locatelli 9a238d43cd Merge branch 'SDK' into develop 2022-09-22 18:48:31 +02:00
Samuele Locatelli a1e9f6a523 Update visualizzazione parametri x TAB 2022-09-22 18:48:18 +02:00
Samuele Locatelli a324ef0ba1 Merge branch 'develop' into SDK 2022-09-22 18:24:40 +02:00
Samuele Locatelli 5581f97e75 update objItem:
- aggiunto description oltre a nome
- fatto x evitare ambiguità scrittura parametri
2022-09-22 18:24:32 +02:00
Samuele Locatelli 9935eb3cb7 Merge tag 'AddFLSnapshotFunct' into develop
Aggiunta metodi chiamata stored x salvataggio snapshot dati FluxLog
2022-09-19 10:51:22 +02:00
Samuele Locatelli 50d8dcf294 Merge branch 'release/AddFLSnapshotFunct' 2022-09-19 10:51:07 +02:00
Samuele Locatelli 0414396464 Merge branch 'SDK' into develop 2022-09-19 10:50:37 +02:00
Samuele Locatelli 392c624c53 Update IO x FL Snapshot
- aggiunta gestione nuova stored
- aggiunto metodo da chiamare x salvataggio
2022-09-19 10:50:24 +02:00
Samuele Locatelli 09cb877ee0 Riorganizzazione alfabetica classe IOB controller 2022-09-19 10:24:07 +02:00
Samuele Locatelli 06f26b7dd7 Fix formato output date 2022-09-15 19:35:34 +02:00
Samuele Locatelli 7159e9247d Aggiunta tipo Byte in SDK 2022-09-09 16:03:36 +02:00
Samuele Locatelli 52f5e9574f Merge branch 'develop' into SDK 2022-07-29 13:12:47 +02:00
Samuele Locatelli c12713ddc3 Aggiunta enum dati plc LH invertiti Int/DInt 2022-07-29 13:12:35 +02:00
Samuele Locatelli 7b7b70ff02 Merge tag 'UpdateTab4Test' into develop
Update vari x cercare velocizzare
2022-07-26 17:29:47 +02:00
Samuele Locatelli c60e398f9e Merge branch 'release/UpdateTab4Test' 2022-07-26 17:29:36 +02:00
Samuele Locatelli 059cb86f17 refresh condizione https x TAB 2022-07-26 17:29:08 +02:00
Samuele Locatelli 78375f5092 fix placeholder file 2022-07-26 16:02:02 +02:00
Samuele Locatelli d2367642c7 nuoget update
- microsoft.web.infrastructure
- sharpcompress
- netCore.Platforms
- boostrap 4.6.1
2022-07-26 16:01:10 +02:00
Samuele Locatelli 883780b127 NUget update:
- steamware.logger
- system.cryptographic
- system.io
- system.memory
- mongoDb
2022-07-26 15:58:00 +02:00
Samuele Locatelli b106236bfa Vero fix errore redirect + thread abort 2022-07-26 15:55:59 +02:00
Samuele Locatelli 22203ffeb7 Revert "Fix errore x redirect page TAB"
This reverts commit 673dc54272.
2022-07-26 15:55:35 +02:00
Samuele Locatelli 673dc54272 Fix errore x redirect page TAB 2022-07-26 15:55:19 +02:00
Samuele Locatelli 57189bf071 Nuget refresh:
- steamware libs
- eliminazione snappy.net
- AIM
- DNS
- NLog
- Redis
2022-07-26 15:36:22 +02:00
Samuele Locatelli 3952de29c0 Update libreria scanner x test 2022-07-26 15:31:28 +02:00
Samuele Locatelli 435260018e typo redKey art impiegati 2022-07-26 15:25:32 +02:00
Samuele Locatelli d9b3015e64 Merge tag 'UpdateMpIoParamUntrack' into develop
Update procedura scrittura parametri Giacovelli
2022-07-14 11:23:41 +02:00
Samuele Locatelli c580eb9464 Merge branch 'release/UpdateMpIoParamUntrack' 2022-07-14 11:23:30 +02:00
Samuele Locatelli 6cea80a232 MP-IO
- FIX errore ri-scrittura parametri (ex Giacovelli)
2022-07-14 11:23:05 +02:00
Samuele Locatelli 7b893a067b Merge branch 'SDK' into develop 2022-07-14 10:01:00 +02:00
Samuele Locatelli 0bf575808f MP-IO
- FIX salvataggio parametri "non principali" in boot IOB
2022-07-14 09:59:12 +02:00
Samuele Locatelli 7ab404b417 Merge branch 'develop' into SDK 2022-07-13 18:40:56 +02:00
Samuele Locatelli d858c7124e ancora update caso raw flux x IO 2022-07-13 18:40:42 +02:00
Samuele Locatelli a7bcc09f4e Update obj vari
- caso LH/HL x valori Real modbus (ex Centerfrigo)
- inizio fix invio dati RAW (errori su IO) - da completare
2022-07-13 18:40:32 +02:00
Samuele Locatelli d0c86fdf4d Merge tag 'PromOdlFiltroRepartiAll' into develop
Aggiunta possibilità visualizzazione PODL tutte (in caso di tutti i
reparti)
2022-07-06 15:34:31 +02:00
Samuele Locatelli ed0be5f363 Merge branch 'release/PromOdlFiltroRepartiAll' 2022-07-06 15:34:14 +02:00
Samuele Locatelli 99dea91fdb Aggiunto sel TUTTI x ADM (filtro reparti) 2022-07-06 15:33:38 +02:00
Samuele Locatelli b4e40b2ef3 SITE
- inizio modifiche webconfig x test Jetco
2022-07-06 15:01:53 +02:00
Samuele Locatelli dcd2fb9bff ADM
- Fix file conf DEV e Jtco x testing
2022-07-06 14:57:24 +02:00
Samuele Locatelli ada7238daa Aggiunta config x PROD DB
- aggiunto file conf x test Jetco
2022-07-06 14:55:51 +02:00
Samuele Locatelli c0ca4921f0 Merge tag 'UpdateAlarmsDisplay' into develop
Fix alarm display x SITE
2022-07-01 17:25:05 +02:00
Samuele Locatelli e473fbafd6 Merge branch 'release/UpdateAlarmsDisplay' 2022-07-01 17:24:55 +02:00
Samuele Locatelli 0cf48e0f98 Ok display site/tab x attuale versione allarmi 2022-07-01 17:17:33 +02:00
Samuele Locatelli b45e40c3f2 Sistemato invio email con geAuth 2022-07-01 15:54:54 +02:00
Samuele Locatelli e1c82e1ce6 AlarmLog
- ok gestione icone/click
- email NON sembrano partire
2022-06-30 19:04:17 +02:00
Samuele Locatelli ba4f3fcdeb Merge tag 'UpdateManAlarmLog' into develop
Update gestione allarmi con chiusura precedente allarme
2022-06-30 17:37:53 +02:00
Samuele Locatelli f71a9b9a6b Merge branch 'release/UpdateManAlarmLog' 2022-06-30 17:37:42 +02:00
Samuele Locatelli 2608a9f908 AlarmLog
- Update parziale visualizzaizone (da rivedere...)
2022-06-30 17:37:16 +02:00
Samuele Locatelli 4578edba08 Update metodi alarm Log 2022-06-30 17:36:38 +02:00
Samuele Locatelli 4f65b00c16 Bozza pagina allarmi in tablet 2022-06-30 14:06:14 +02:00
Samuele Locatelli 766a60b8dc Fix grafico display allarmi SITE 2022-06-30 12:35:50 +02:00
Samuele Locatelli 9fb5979e9f Fix display allarmi 2022-06-30 10:15:22 +02:00
Samuele Locatelli 07523099dc Merge tag 'UpdateFluxLogDisplaySite' into develop
Aggiornamento visualizzazione fluxlog filtrato con stored e filtro
2022-06-29 11:46:51 +02:00
Samuele Locatelli c7bcce7a45 Merge branch 'release/UpdateFluxLogDisplaySite' 2022-06-29 11:46:36 +02:00
Samuele Locatelli 6713644c79 Update filtraggio fluxLog da DB 2022-06-29 11:46:15 +02:00
Samuele Locatelli c353b941fa Merge branch 'SDK' into develop 2022-06-27 18:59:10 +02:00
Samuele Locatelli 1f466bcf15 Aggiunta task
- aggiunto set Supplier (es grower x ICOEL)
2022-06-27 18:58:43 +02:00
Samuele Locatelli 227787b34e Merge branch 'develop' into SDK 2022-06-27 08:43:46 +02:00
Samuele Locatelli 7a14b315c6 Aggiunta gestione memorie Bitmap
- nuovo enum
- array x decodifica stati
2022-06-27 08:43:40 +02:00
Samuele Locatelli 826958b306 Merge tag 'AddAlarmrecording' into develop
Aggiunta tab e stored x registrazione allarmi
2022-06-21 20:44:55 +02:00
Samuele Locatelli 8088b1b109 Merge branch 'release/AddAlarmrecording' 2022-06-21 20:44:46 +02:00
Samuele Locatelli 07234b95f6 Aggiunta gestione registrazione AlarmLog x MP-IO + update DB 2022-06-21 20:40:34 +02:00
Samuele Locatelli 426ab578fe Gestione salvataggio allarmi:
- Abbozzato metodo in IOB mapo
2022-06-21 20:12:57 +02:00
Samuele Locatelli 5d2f67b20c Merge tag 'SdkAddNewPlcType' into develop
Update plcType x gestione endiannes non standard x ModBus (es
Centerfrigo)
2022-06-21 16:05:31 +02:00
Samuele Locatelli 015d370bd3 Merge branch 'release/SdkAddNewPlcType' 2022-06-21 16:05:11 +02:00
Samuele Locatelli a9a68782ea Merge branch 'develop' into SDK 2022-06-21 16:04:28 +02:00
Samuele Locatelli 567004d820 Update enum
- nuovi tipi memoria
- necessari x gestione endiannes ModBus (Centerfrigo)
2022-06-21 16:04:21 +02:00
Samuele Locatelli f9dbcfdebb Merge tag 'AddFlogCacheRedis' into develop
Aggiunta cache redis x FLog
2022-06-06 10:02:14 +02:00
Samuele Locatelli 075b053ea3 Merge branch 'release/AddFlogCacheRedis' 2022-06-06 10:02:04 +02:00
Samuele Locatelli 0a8eae4d74 Update salvataggio FLog su REDIS x cache rapida (recupero MON) 2022-06-06 10:01:38 +02:00
Samuele Locatelli eb1015f350 Merge branch 'develop' into SDK 2022-05-30 11:39:52 +02:00
Samuele Locatelli 70e1b4c120 Aggiunto task x syncData DB 2022-05-30 11:39:43 +02:00
Samuele Locatelli 5ba5c709c6 Merge tag 'UpdateSdkObjRawTrasf' into develop
Modifica oggetti rawtransfer (da testare)
2022-05-28 08:56:02 +02:00
Samuele Locatelli 8ba95d3a4f Merge branch 'release/UpdateSdkObjRawTrasf' 2022-05-28 08:55:48 +02:00
Samuele Locatelli 0fe1d38c8e Merge branch 'develop' into SDK 2022-05-28 08:54:57 +02:00
Samuele Locatelli 9bb4abb2cd Update obj x trasfer dati 2022-05-28 08:54:33 +02:00
Samuele E. Locatelli 6353adaae5 Merge branch 'develop' 2022-05-24 10:43:42 +02:00
Samuele Locatelli 61355d3a42 Fix riorganizzazione progetto 2022-05-23 18:05:12 +02:00
Samuele Locatelli 4ab99c12fd Merge tag 'AddRawTransferPreliminary' into develop
Aggiunta preliminare RawTransfer data
2022-05-23 17:22:01 +02:00
Samuele Locatelli a381d98c76 Merge branch 'release/AddRawTransferPreliminary' 2022-05-23 17:21:50 +02:00
Samuele Locatelli 8419db1ce0 Aggiunto modello x ricezione dati 2022-05-23 17:21:04 +02:00
Samuele Locatelli 65f04aad5f Aggiunto enum x dati raw da ricevere 2022-05-21 12:27:06 +02:00
Samuele Locatelli 238909e317 Merge tag 'AddLog_SaveDataItems' into develop
Agigunta log x save data items
2022-05-13 08:54:08 +02:00
Samuele Locatelli 4443813578 Merge branch 'release/AddLog_SaveDataItems' 2022-05-13 08:54:00 +02:00
Samuele Locatelli 9958148f3b Log x ricezione saveDataItems (da errori x ICOEL) 2022-05-13 08:52:46 +02:00
Samuele Locatelli 408e6b822a Update x gestione clienti/fornitori filtrati da AZIENDA selezionata in ADM 2022-05-02 11:07:15 +02:00
Samuele Locatelli 920e8d9ee3 ULteriore ottimizzazione procedura cache articoli no eliminabili 2022-04-30 11:25:39 +02:00
Samuele Locatelli 7310054ab6 Speedup check articoli usati 2022-04-30 09:27:39 +02:00
Samuele Locatelli 045d144823 Bozza modifica x speedup controllo articoli già impiegati 2022-04-29 19:34:30 +02:00
Samuele Locatelli c214db1c2c Merge tag 'OptimAnagArticoliSpeed' into develop
Ottimizzazione cache controllo articoli impiegati/non impiegati
2022-04-29 18:47:04 +02:00
Samuele Locatelli 2ca969226b Merge branch 'release/OptimAnagArticoliSpeed' 2022-04-29 18:46:39 +02:00
Samuele Locatelli 895b54beb7 Cache x ottimizzazione velocità accesso pagina articoli 2022-04-29 18:45:47 +02:00
Samuele Locatelli 33b33b9ef4 Filtraggio per tipo articoli 2022-04-29 16:05:52 +02:00
Samuele Locatelli 89fa14bbec FIX ADM/MAG x dip dll 2022-04-29 11:03:37 +02:00
Samuele Locatelli 648b68e940 Fix MP-SITE proj x dipendente libs 2022-04-29 11:01:21 +02:00
Samuele Locatelli fbf5197c52 Fix IO proj conf 2022-04-29 10:59:20 +02:00
Samuele Locatelli ea8e12efa8 Merge tag 'GestioneAzienda' into develop
Aggiunto gestione sel azienda corrente
2022-04-29 10:57:46 +02:00
Samuele Locatelli a2e765a7f8 Merge branch 'release/GestioneAzienda' 2022-04-29 10:57:32 +02:00
Samuele Locatelli dd8315035c Merge branch 'feature/GestioneAzienda' into develop 2022-04-29 10:57:06 +02:00
Samuele Locatelli d461fac76d Refresh steamwarelibs 2022-04-29 10:56:40 +02:00
Samuele Locatelli eda9520199 Nuget upgrade Microsoft.Web.Infrastructure 2022-04-29 10:06:44 +02:00
Samuele Locatelli eb2a28c6b2 NUget update stackexchange redis 2022-04-29 10:05:34 +02:00
Samuele Locatelli de30f055bf Nuget update SharpCompress 2022-04-29 10:02:27 +02:00
Samuele Locatelli bf68fd20cd Nuget updatre microsoft libs (NetCore platform + PerfCounter) 2022-04-29 10:01:18 +02:00
Samuele Locatelli 53905f8b81 Nuget update MongoDB 2022-04-29 10:00:11 +02:00
Samuele Locatelli eacc1575b1 Nuget update WebAPI 2022-04-29 09:56:54 +02:00
Samuele Locatelli a264d6cbc0 Nuget update NLog 2022-04-29 09:52:50 +02:00
Samuele Locatelli a63aa502f9 Completo editing company selector 2022-04-29 09:51:37 +02:00
Samuele Locatelli 58ca857f83 aggiunta preliminare gestione cambio valore config x azienda 2022-04-29 09:46:43 +02:00
Samuele Locatelli 6039686a3c completo refresh nuget steamware libs 2022-04-29 09:46:29 +02:00
Samuele Locatelli 661662406d Completo udpate delle steamware libs + pulizia files lib extra 2022-04-29 09:43:31 +02:00
Samuele Locatelli 70586ffdc8 Update nuget x Steamware libs 2022-04-29 09:25:19 +02:00
Samuele Locatelli b5c5900e02 Refresh Yaml 2022-04-29 09:23:55 +02:00
Samuele Locatelli c46d94e51a Bozza gestione company selector 2022-04-29 09:23:42 +02:00
Samuele Locatelli 5bc5763fd5 Typo x vers instabile 2022-04-26 16:11:26 +02:00
Samuele Locatelli 794e02597f Merge branch 'develop' into SDK 2022-04-26 16:09:04 +02:00
Samuele Locatelli dc29400bfd fix altro nuspec 2022-04-26 16:07:08 +02:00
Samuele Locatelli fcdcb1b13d fix nuspec invertiti debug/release 2022-04-26 16:07:02 +02:00
Samuele Locatelli 959b538d0e Correzione invio versione debug selezionando solo dll puntuale 2022-04-26 15:58:36 +02:00
Samuele Locatelli 6e2ccc3927 Fix tag + last dot 2022-04-26 15:46:10 +02:00
Samuele Locatelli f3b621444d Merge branch 'SDK' into develop 2022-04-26 15:43:51 +02:00
Samuele Locatelli be6ccc9ed2 Pubblicazioni anche su develop di versione unstable 2022-04-26 15:43:43 +02:00
Samuele Locatelli 604f2e9262 Fix debug name typo 2022-04-26 15:38:03 +02:00
Samuele Locatelli 76640c9e5a ancora replace typo fix 2022-04-26 15:36:51 +02:00
Samuele Locatelli be4a64289d typo replace string 2022-04-26 15:35:37 +02:00
Samuele Locatelli 5bd685e6ca Update yaml (da testare) 2022-04-26 15:22:35 +02:00
Samuele Locatelli e1c7af0820 Aggiunta conf nuspec 2022-04-26 15:22:26 +02:00
Samuele Locatelli 60b66179d4 Aggiunta preliminare file nuspec 2022-04-26 14:52:17 +02:00
Samuele Locatelli 53093f60d0 Merge branch 'develop' into SDK 2022-04-21 15:28:45 +02:00
Samuele Locatelli f88df90038 Update x pubblicazione nuget 2022-04-21 15:28:34 +02:00
Samuele Locatelli b3bdecca68 Merge branch 'SDK' into develop 2022-04-21 08:31:37 +02:00
Samuele Locatelli 4eba76ba58 Update controller x aggiunta sendReboot da IOB + test fix yaml nuget 2022-04-21 08:31:28 +02:00
Samuele Locatelli 4f89000a0c Merge branch 'develop' into SDK 2022-04-20 19:23:12 +02:00
Samuele Locatelli 68993ba2b3 Cambio da int --> double x factor di scalatura 2022-04-20 19:22:49 +02:00
Samuele Locatelli 033ee203d5 Merge branch 'develop' into SDK 2022-04-20 19:09:34 +02:00
Samuele Locatelli 16fd43be03 Aggiunto tipo HLPInt: interi calcolati moltiplicando HIGH value x mezzo Uint16.Max 2022-04-20 19:08:49 +02:00
Samuele Locatelli 3776b002d9 Merge tag 'UpdatePackListEdilchimica' into develop
Update x edilchimica
2022-04-15 17:06:34 +02:00
Samuele Locatelli 9bbcd0c306 Merge branch 'release/UpdatePackListEdilchimica' 2022-04-15 17:06:27 +02:00
Samuele Locatelli 1f7d2b3503 Update MAG x force reload da PackList + fix doppia chaimata 2022-04-15 16:57:04 +02:00
Samuele Locatelli 8cfd1f5932 Commentate parti MON 2022-04-14 17:26:59 +02:00
Samuele Locatelli 24457de564 Update sln 2022-04-14 17:25:26 +02:00
Samuele Locatelli a7835d9617 Migrazione progetto MON a Blazor core --> tolgo da main dir 2022-04-14 17:25:12 +02:00
Samuele Locatelli 3ef5a10d78 Merge tag 'CompleteCliForDestinMgmt' into develop
Completato editing delle destinazioni CliFor
2022-04-08 16:28:58 +02:00
Samuele Locatelli 31a86f6fa4 Merge branch 'release/CompleteCliForDestinMgmt' 2022-04-08 16:28:37 +02:00
Samuele Locatelli 84bc83e17c Completato editing CliFor + destinazioni 2022-04-08 16:23:43 +02:00
Samuele Locatelli b120a55eb6 Inizio conf x editing CRUD destinaizoni clienti 2022-04-08 12:25:51 +02:00
Samuele Locatelli 2001465f51 Merge branch 'master' into develop 2022-04-08 12:03:16 +02:00
Samuele Locatelli 74a134043a Refresh grafico comportamento selezione/dettaglio 2022-04-08 12:03:00 +02:00
Samuele Locatelli e83a223aa3 Update modalità display in selezione dettaglio 2022-04-08 11:18:34 +02:00
Samuele Locatelli c7fbfff64f Bozza sel dettaglio destinazioni cliente 2022-04-08 10:47:41 +02:00
Samuele Locatelli 3404caaa2a Completata review pagina CliFor x CRUD 2022-04-08 10:27:45 +02:00
Samuele Locatelli 9cb0f7e079 Ancora x pagina Cli/For 2022-04-07 18:45:33 +02:00
Samuele Locatelli 7928d423e5 Bozza pagina cli/for 2022-04-07 18:44:50 +02:00
Samuele Locatelli 7f4777ecd3 Merge tag 'RefreshDtRifConferma' into develop
Refresh DtRif  post conferma
2022-04-01 14:14:38 +02:00
Samuele Locatelli 31692c970a Merge branch 'release/RefreshDtRifConferma' 2022-04-01 14:14:27 +02:00
Samuele Locatelli 4d479427dc forza refresh dtRif post conferma pezzi 2022-04-01 14:14:02 +02:00
Samuele Locatelli edfe2b6ae9 Merge tag 'FixSelezioneOdlStampa' into develop
Fix rilettura ODL in selezione
2022-03-31 19:01:17 +02:00
Samuele Locatelli d2b370d1c7 Merge branch 'release/FixSelezioneOdlStampa' 2022-03-31 19:00:44 +02:00
Samuele Locatelli ad86666535 fix rilettura dati prod ODL in caso di selezione stampa 2022-03-31 19:00:25 +02:00
Samuele Locatelli bee83545bd Merge tag 'FixErrorePL' into develop
Fix errore PL
2022-03-31 18:25:19 +02:00
Samuele Locatelli b92d9c9772 Merge branch 'release/FixErrorePL' 2022-03-31 18:25:13 +02:00
Samuele Locatelli 5b9ab2ecdd Update gestione doppia lettura UDC evitato con redis cache 2022-03-31 18:24:43 +02:00
Samuele Locatelli c5d90ad386 Fix x stored lettura qta lavorati x ODL chiusi 2022-03-31 17:17:16 +02:00
Samuele Locatelli 0f8ef8b30a Merge tag 'UpdatePackListReport' into develop
Update report x PackList
2022-03-30 12:44:44 +02:00
Samuele Locatelli 5295b34133 Merge branch 'release/UpdatePackListReport' 2022-03-30 12:44:32 +02:00
Samuele Locatelli 5503d3885f Update dataset x Report stampa PackList 2022-03-30 12:44:03 +02:00
Samuele Locatelli 7763150328 Update stored x print packList 2022-03-30 12:39:17 +02:00
Samuele Locatelli a7d51b4677 Merge tag 'FixBugMagEdilchimica' into develop
Fix vari su segnalazione Giancarlo post formazione Edilchimica
2022-03-25 16:56:47 +01:00
Samuele Locatelli d77d2f0a1b Merge branch 'release/FixBugMagEdilchimica' 2022-03-25 16:56:33 +01:00
Samuele Locatelli ce88caa94a Fix gestione add ordini paerti qta -_> qtaEvadibile 2022-03-25 16:56:09 +01:00
Samuele Locatelli 5dd1aba6a1 fix refresh velòoce in sel pedane 2022-03-25 16:47:05 +01:00
Samuele Locatelli af2ec21907 Fix calcolo dataora prod x ODL chiusi in stampa 2022-03-25 16:40:04 +01:00
Samuele Locatelli 56cd2b68f9 update errore "giallo" se rileggo UDC 2 volte su stessa pedana 2022-03-25 16:13:33 +01:00
Samuele Locatelli 83cd8530e6 Merge tag 'AddSlaveFixEndSetup' into develop
Aggiunta gestione fix end setup su slave machine
2022-03-18 13:35:33 +01:00
Samuele Locatelli a24fb76526 Merge branch 'release/AddSlaveFixEndSetup' 2022-03-18 13:35:21 +01:00
Samuele Locatelli a4e2adc1c1 Chiamata fix end setup x ogni slave machine 2022-03-18 13:34:57 +01:00
Samuele Locatelli 75812d24ba fix minori (levato un doppio log x invio task2exe) 2022-03-18 12:16:03 +01:00
Samuele Locatelli fbed207588 fix gitignore 2022-03-18 12:15:29 +01:00
Samuele Locatelli d2b48535e8 Merge tag 'UpdateChildTaskOrder' into develop
Fix ordine aggiornamento parent/child x ODL
2022-03-08 12:15:11 +01:00
Samuele Locatelli 35c50608d9 Merge branch 'release/UpdateChildTaskOrder' 2022-03-08 12:14:46 +01:00
Samuele Locatelli d1e2037ac2 cambio ordine chiamate parent/child 2022-03-08 12:14:24 +01:00
Samuele Locatelli 99f5c0b9dd cleanup vari di if false 2022-03-04 11:44:45 +01:00
Samuele Locatelli 4245a33f7f Merge tag 'SendStartStopSetupOnSlaveMachines' into develop
Fix send on slave machine per start/stop setup da TAB
2022-03-04 09:15:14 +01:00
Samuele Locatelli 80c673f5e6 Merge branch 'release/SendStartStopSetupOnSlaveMachines' 2022-03-04 09:15:02 +01:00
Samuele Locatelli a7f90ddedb Update gestione ODL: invio start/stop setup alle amcchine slave 2022-03-04 09:13:26 +01:00
Samuele Locatelli 1ba45499bf Merge branch 'develop' 2022-03-01 10:26:59 +01:00
Samuele Locatelli 2d40101d8a Merge branch 'SDK' into develop 2022-03-01 10:26:45 +01:00
Samuele Locatelli 22a761a4c9 Merge tag 'RefactorObjCLass' into develop
Inizio merge x refactor classe OBJ in + classi
2022-03-01 10:26:39 +01:00
Samuele Locatelli 86aea81f5a Merge branch 'release/RefactorObjCLass' 2022-03-01 10:26:15 +01:00
Samuele Locatelli 5b512da543 Spacchettamento classe objects in + file x semplificare gestione 2022-03-01 10:24:41 +01:00
Samuele Locatelli 3f8b1e16d6 Merge tag 'AddProcessULog' into develop
Aggiunta processo gestione UserLog
2022-02-28 19:42:10 +01:00
Samuele Locatelli 8cfd967526 Merge branch 'release/AddProcessULog' 2022-02-28 19:42:02 +01:00
Samuele Locatelli f5ecdc6f84 Update processo registrazione ULog 2022-02-28 19:41:44 +01:00
Samuele Locatelli 21f04e22e2 Merge tag 'AddGestioneDichiarazioni' into develop
Fix gestione registrazione dichiarazioni + altre ottimizzazioni
2022-02-28 11:51:03 +01:00
Samuele Locatelli cdf3bb7af9 Merge branch 'release/AddGestioneDichiarazioni' 2022-02-28 11:50:47 +01:00
Samuele Locatelli f5cb699d78 update metodi IOB x MP-IO x gestione invio userAction 2022-02-28 11:50:10 +01:00
Samuele Locatelli b82d065e1e cleanup 2022-02-28 11:49:56 +01:00
Samuele Locatelli 82367726eb update insomnia call con test chiamata x invio userActions 2022-02-28 11:49:45 +01:00
Samuele Locatelli 6040e2e370 update pag dichiarazioni 2022-02-21 12:48:29 +01:00
Samuele Locatelli 6476b39186 Add userControls x dichiarazioni 2022-02-21 12:48:21 +01:00
Samuele Locatelli 862bee6630 Aggiunta metodi x gest dichiarazioni (list + insert) 2022-02-21 12:48:10 +01:00
Samuele Locatelli 60ac77bb6a Aggiunta info x macchina cui è collegata info utente (+ tutte x login) 2022-02-19 19:53:43 +01:00
Samuele Locatelli 16723a9427 Inizio creazione pagina x dichiarazioni (da fare davvero) x lista operazioni dichiarate (es login, lotti) 2022-02-19 19:44:55 +01:00
Samuele Locatelli 5a4387ee43 modifica login con registrazione login operatori in diario dichiarazioni 2022-02-19 19:44:31 +01:00
Samuele Locatelli dfefe46dbc Aggiunta metodi x creazione righe DiarioDichiarazioni 2022-02-19 19:44:16 +01:00
Samuele Locatelli ea2e866648 Fix comportamento http/httpsd (da provare) 2022-02-19 12:49:35 +01:00
Samuele Locatelli 0af14f59cf test async conf x rendering (x problema login) 2022-02-18 19:12:52 +01:00
Samuele Locatelli bb08824de1 Eliminato progetto LAND (passato su proj MAPO-CORE) 2022-02-18 18:56:40 +01:00
Samuele Locatelli a1a71babd6 refresh NetAnalyzers 2022-02-18 18:49:12 +01:00
Samuele Locatelli 38ea58b8b5 refresh fontawesome + nlog 2022-02-18 18:48:23 +01:00
Samuele Locatelli c0ef6c0d9a Refresh steamwarelibs a vers 5.1.2202.1818 + dipendenze 2022-02-18 18:46:27 +01:00
Samuele Locatelli 8189cf7fb6 log dati su cookie 2022-02-18 17:30:25 +01:00
Samuele Locatelli 4732136e26 invio parametro opzionale set parameters in setup ODL 2022-02-18 12:00:08 +01:00
Samuele Locatelli 5953e14d6c Merge branch 'SDK' into develop 2021-11-03 13:01:51 +01:00
Samuele Locatelli f02e3fc5c6 Aggiunta enum MEDIANA 2021-11-03 13:01:36 +01:00
Samuele Locatelli f8e25a808d Merge branch 'develop' into SDK 2021-10-26 19:01:03 +02:00
Samuele Locatelli c844d33743 Merge branch 'SDK' into develop 2021-10-26 19:00:54 +02:00
Samuele Locatelli ef181985bc Merge tag 'UpdateObjItemSdk' into develop
Update gestione ObjItem
2021-10-26 19:00:47 +02:00
Samuele Locatelli 728d62f165 Merge branch 'release/UpdateObjItemSdk' 2021-10-26 19:00:34 +02:00
Samuele Locatelli da8847b8f9 update objItem 2021-10-26 19:00:03 +02:00
Samuele Locatelli e3ebbc337a Merge branch 'develop' into SDK 2021-10-26 18:42:09 +02:00
Samuele Locatelli 31e78cfb34 Merge tag 'UpdateObjSDK' into develop
Aggiunta classi di comunicazione
2021-10-26 18:37:30 +02:00
Samuele Locatelli f9152eee36 Merge branch 'release/UpdateObjSDK' 2021-10-26 18:37:13 +02:00
Samuele Locatelli fde6e72f4f Compeltamento aggiornamento datalayer 2021-10-26 18:36:34 +02:00
Samuele Locatelli d3efe7688a Aggiunto in SDK gestione unità di misura 2021-10-26 18:35:52 +02:00
Samuele Locatelli d5978304e7 Merge branch 'SDK' into develop 2021-09-28 09:03:20 +02:00
Samuele Locatelli d9e05d80b7 commentato send non funzionante come tag helper 2021-09-28 09:03:10 +02:00
Samuele Locatelli 3a8118fc06 Merge branch 'SDK' into develop 2021-09-28 08:55:50 +02:00
Samuele Locatelli 86f0751091 no parametro author 2021-09-28 08:54:40 +02:00
Samuele Locatelli c79e17c66a fix nuget syntax author 2021-09-28 08:53:50 +02:00
Samuele Locatelli 34e8435ed9 fix SDK upload 2021-09-28 08:51:38 +02:00
Samuele Locatelli f199abc6ee Merge tag 'AddModBusAddrType' into develop
Aggiunta tipo addr modbus nel modello dati enum
2021-09-28 08:43:25 +02:00
Samuele Locatelli 25d7590e53 Merge branch 'release/AddModBusAddrType' 2021-09-28 08:43:15 +02:00
Samuele Locatelli f44e77b74e Merge branch 'SDK' into develop 2021-09-28 08:42:50 +02:00
Samuele Locatelli e8b86c5517 MOdifica Enum x tipo ModBus 2021-09-28 08:42:37 +02:00
Samuele Locatelli 7343109652 Merge tag 'FixSdkCreation' into develop
Ripristinata gestione SDK
2021-09-28 08:15:15 +02:00
Samuele Locatelli 35f740fc9f Merge branch 'release/FixSdkCreation' 2021-09-28 08:15:05 +02:00
Samuele Locatelli 05be044b9b Merge branch 'SDK' into develop 2021-09-28 08:14:36 +02:00
Samuele Locatelli b44c7af779 Cleanup codice yaml 2021-09-28 08:12:05 +02:00
Samuele Locatelli 83a849384c sintassi alternativa 2021-09-28 08:10:42 +02:00
Samuele Locatelli 4178beedfa ancora sintassi nuget 2021-09-28 08:05:54 +02:00
Samuele Locatelli d7437c9702 update step SDK 2021-09-28 08:02:02 +02:00
Samuele Locatelli d74d7ad4ef Merge branch 'develop' into SDK 2021-09-27 19:07:33 +02:00
Samuele Locatelli bff9829f1d modifica yaml x ModBus + pubblicazione sdk 2021-09-27 19:07:19 +02:00
Samuele Locatelli 5223f6f519 Aggiunti enum ModBus x SDK 2021-09-27 19:07:10 +02:00
Samuele Locatelli a099fa9186 Merge tag 'FixCurlSendManifest2Nexus' into develop
Fix refresh installers
2021-09-27 17:06:20 +02:00
Samuele Locatelli 1feecbc181 Merge branch 'release/FixCurlSendManifest2Nexus' 2021-09-27 17:06:12 +02:00
Samuele Locatelli 174c9b8557 completata review echo pubblicaizone nexus 2021-09-27 17:05:38 +02:00
Samuele Locatelli 5070d84034 echo curl manifest 2021-09-27 17:01:28 +02:00
Samuele Locatelli cdeb766f55 cambio verbosity CURL 2021-09-27 16:57:49 +02:00
Samuele Locatelli be5b3eaf1c Merge branch 'develop' 2021-09-27 16:43:24 +02:00
Samuele Locatelli a1dd5f0bb4 update target website x installer 2021-09-27 16:43:14 +02:00
Samuele Locatelli ed39c40edb Merge tag 'FixTabIcon_34_49' into develop
Aggiunte icone x deploy in proj
2021-09-27 16:31:07 +02:00
Samuele Locatelli f00aa7e608 Merge branch 'release/FixTabIcon_34_49' 2021-09-27 16:30:57 +02:00
Samuele Locatelli 3041619a67 Inclusione icone 2021-09-27 16:30:24 +02:00
Samuele Locatelli f020298064 Merge tag 'FixCICD' into develop
Fix configurazioen x generazione manifest/changelog corretti
2021-09-27 16:17:11 +02:00
Samuele Locatelli 737f80c4a1 Merge branch 'release/FixCICD' 2021-09-27 16:07:22 +02:00
Samuele Locatelli e975b4dedb UPdate conf zip 2021-09-27 16:02:49 +02:00
Samuele Locatelli 7d31940869 Fix conf x zip name in manifest 2021-09-27 15:53:50 +02:00
Samuele Locatelli 112ff63d84 Fix manifest conf 2021-09-27 15:49:43 +02:00
Samuele Locatelli d76ce24dff curl NON verboso 2021-09-27 15:46:38 +02:00
Samuele Locatelli 0a6e7ba21e cambio sintassi invio manifest/ChangeLog 2021-09-27 15:43:59 +02:00
Samuele Locatelli e8c42ae5e5 upload yaml x xml 2021-09-27 15:36:52 +02:00
Samuele Locatelli c6c1db90e1 typo resource --> resources 2021-09-27 15:33:42 +02:00
Samuele Locatelli cbcdd465f1 typo fix yaml 2021-09-27 15:23:11 +02:00
Samuele Locatelli defda3e259 upteriore test fix path x yaml 2021-09-27 15:21:30 +02:00
Samuele Locatelli f3eb05b7b7 fix yaml syntax x pwshell 2021-09-27 15:17:55 +02:00
Samuele Locatelli cbacb28926 Update yaml x fix conf manifest 2021-09-27 15:14:49 +02:00
Samuele Locatelli c6df8f598e Merge tag 'FixHashDeploy' into develop
Fix creazione hash file progetto
2021-09-27 10:21:15 +02:00
Samuele Locatelli 3026a37ec1 Merge branch 'release/FixHashDeploy' 2021-09-27 10:20:54 +02:00
Samuele Locatelli d6a84a69e1 Fix componente hashBuild di deploy 2021-09-27 10:17:29 +02:00
Samuele Locatelli fa5af9faf5 Merge tag 'FixStableDeploy' into develop
Fix versione stable x deploy
2021-09-27 09:57:51 +02:00
Samuele Locatelli 2295f0a979 Merge branch 'release/FixStableDeploy' 2021-09-27 09:57:41 +02:00
Samuele Locatelli bc46dfc17b UPdate yaml x deploy 2021-09-27 09:48:42 +02:00
Samuele Locatelli b2721b3e02 Merge tag 'v_6.14_unificata' into develop
Fix vers 6.14
2021-09-22 17:40:28 +02:00
Samuele Locatelli 77c7bc768c Merge branch 'release/v_6.14_unificata' 2021-09-22 17:40:21 +02:00
Samuele Locatelli 494acec609 Fix pubblicazione TAB 2021-09-22 17:39:37 +02:00
Samuele Locatelli eb8f7756a6 refresh configurazioni progetti 2021-09-22 17:33:16 +02:00
Samuele Locatelli 6f5d2f2571 pulizia libs inutilizzate 2021-09-22 17:33:06 +02:00
Samuele Locatelli 3039f0d9e6 Merge tag 'v_6.14_unificata' into develop
Fix vers numb 6.14
2021-09-22 16:05:17 +02:00
Samuele Locatelli 486b66deba Merge branch 'release/v_6.14_unificata' 2021-09-22 16:04:53 +02:00
Samuele Locatelli a4f99cd7c7 Update CI/CD x replace vers numb corretto 2021-09-22 16:03:51 +02:00
Samuele Locatelli 268c928829 Fix proj LAND 2021-09-22 16:03:37 +02:00
Samuele Locatelli dcc2c0b28f Merge tag 'v_6.14_unificata' into develop
Release unificata MAPO
2021-09-22 12:11:07 +02:00
Samuele Locatelli b0fa171c08 Merge branch 'release/v_6.14_unificata' 2021-09-22 12:10:47 +02:00
Samuele Locatelli ad603cee3d cleanup yaml 2021-09-22 12:10:05 +02:00
Samuele Locatelli 38cf0de049 Merge branch 'Test-ci-cd' into develop 2021-09-22 11:41:03 +02:00
Samuele Locatelli daa520e61d Iinstaller su master + approvazione manuale 2021-09-22 11:40:06 +02:00
Samuele Locatelli c609678322 modifica x test pubblicazione nexus 2021-09-22 11:34:45 +02:00
Samuele Locatelli de63ffbf7d completato test riscrittura aprametrica zip 2021-09-22 11:25:12 +02:00
Samuele Locatelli f823469724 test parametrizzazione zipName 2021-09-22 11:24:08 +02:00
Samuele Locatelli 7c0d79fd0a update fino a staging 2021-09-22 11:16:16 +02:00
Samuele Locatelli 26bf24ebf7 Inizio fix yaml ci/cd 2021-09-22 11:14:23 +02:00
Marco Salvi 9f2a08c80f Update .gitlab-ci.yml file 2021-09-17 11:15:56 +00:00
marco.salvi 753e2132ec Suddivisione build 2021-09-17 13:13:45 +02:00
Marco Salvi 6459fa9c65 Update .gitlab-ci.yml file 2021-09-17 10:20:23 +00:00
marco.salvi bd69ea0777 Test per scrittura nexus 2021-09-17 11:54:01 +02:00
Marco Salvi 39e8120cfc Update .gitlab-ci.yml file 2021-09-17 07:17:56 +00:00
Samuele Locatelli 8917470373 Merge branch 'master' into develop 2021-09-16 19:15:16 +02:00
Samuele Locatelli 3dae11d974 Merge remote-tracking branch 'gitlab.steamware/master' 2021-09-16 19:15:08 +02:00
Samuele Locatelli 1c9509b430 Merge branch 'master' into develop 2021-09-16 19:13:50 +02:00
Samuele Locatelli b46b55e49c Inizio update modello dati x LAND x download/display programmi 2021-09-16 19:13:15 +02:00
Marco Salvi 2abbac35c0 Update .gitlab-ci.yml file 2021-09-16 10:36:28 +00:00
Marco Salvi 2f7e289aaf Update .gitlab-ci.yml file 2021-09-15 14:18:26 +00:00
Marco Salvi 4b256fee30 Update .gitlab-ci.yml file 2021-09-14 16:08:28 +00:00
Marco Salvi 5fd0bf1909 Update .gitlab-ci.yml file 2021-09-14 15:56:27 +00:00
marco.salvi 4527f6b911 Test new target hashBuild 2021-09-14 17:43:32 +02:00
marco.salvi 43604e4377 Disabilito temporaneamente deploy su iis01 2021-09-14 16:56:49 +02:00
marco.salvi 9ebdd50a68 Fix IIS01 2021-09-14 16:30:29 +02:00
marco.salvi 8b056efd9b Test variabile locale per APP_NAME 2021-09-14 15:46:35 +02:00
Samuele Locatelli 7009be0871 Merge branch 'develop' 2021-09-13 11:29:04 +02:00
Samuele Locatelli b4220a1261 Merge tag 'FixCookieSessionTImeouts' into develop
Fix timeout sessione
2021-09-13 11:27:02 +02:00
Samuele Locatelli 4eec0d3bb1 Rimesso in web.config timeout sessione TAB esplicito 2021-09-13 11:25:42 +02:00
Samuele Locatelli a5bb3f7285 Inizio gestione fix gitlab 2021-09-10 18:17:07 +02:00
Samuele Locatelli 1d6788c89d Release iniziale file yaml gitlab x CICD 2021-09-10 17:55:06 +02:00
Samuele Locatelli 41c2b3aa18 Merge branch 'release/FixCookieSessionTImeouts' 2021-09-10 15:24:15 +02:00
Samuele Locatelli 42def6d4a2 Fix timeout: gestito da IIS e non da web.config 2021-09-10 15:23:42 +02:00
Samuele Locatelli a9529a8427 Fix gestione cookie expyre in frazioni di giorno 2021-09-10 15:04:39 +02:00
Samuele Locatelli 5f84fc1aab correizone nexus https in jenkinsfile 2021-09-09 16:45:36 +02:00
Samuele Locatelli 0f621f56bf Merge tag 'TabReviewCookieExpiry' into develop
Expiry in giorni decimali
2021-09-09 16:09:27 +02:00
Samuele Locatelli 2c8d649577 Merge branch 'release/TabReviewCookieExpiry' 2021-09-09 16:09:16 +02:00
Samuele Locatelli 1040582f65 Update expiry date decimale (er aintero) x TAB 2021-09-09 16:08:11 +02:00
Samuele Locatelli 10a050ee09 Merge tag 'FixMagOdlSearch' into develop
Fix search/cancel x articolo ODL
2021-09-01 14:51:48 +02:00
Samuele Locatelli 8d21f655c1 Merge branch 'release/FixMagOdlSearch' 2021-09-01 14:51:39 +02:00
Samuele Locatelli 41bca8823f MAG: Update con btn search + reset x articolo ODL 2021-09-01 14:51:12 +02:00
Samuele Locatelli a96fe723b2 Fix git spread (eslude master) 2021-09-01 10:22:20 +02:00
Samuele Locatelli ced24cb340 Merge tag 'AddMagOdlPrintArtSearch' into develop
FIx ricerca articolo x ristampa ODL
2021-09-01 10:22:11 +02:00
Samuele Locatelli bea5804f8f Merge branch 'release/AddMagOdlPrintArtSearch' 2021-09-01 10:21:15 +02:00
Samuele Locatelli bd1d80fbdb Aggiunta funzionalità ricerca x articolo x ristampa ODL MAG 2021-09-01 10:20:41 +02:00
Samuele Locatelli df8dbbfd0c Merge tag 'FixDerogaCheck' into develop
Fix gestioen deroca (ciclo su ttute le richieste)
2021-08-31 09:31:30 +02:00
Samuele Locatelli 41e41157f7 Merge branch 'release/FixDerogaCheck' 2021-08-31 09:31:19 +02:00
Samuele Locatelli 59fb6a2166 Fix controllo deroghe e abilitazione force 2021-08-31 09:29:11 +02:00
Samuele Locatelli d5614138ec Update con registrazione forzata/non forzata scheda tecnica (check) 2021-08-02 12:42:46 +02:00
Samuele Locatelli a70e22c95c Merge branch 'develop' into beta 2021-07-30 17:30:47 +02:00
Samuele Locatelli 70aa4d31da Fix errore elencolotti vuoto 2021-07-30 17:29:45 +02:00
Samuele Locatelli 6443424455 fix fontawesome e font woff 2021-07-30 17:28:45 +02:00
Samuele Locatelli 9fc3a81560 Merge branch 'develop' into SDK 2021-07-28 12:55:26 +02:00
Samuele Locatelli 668a405901 Fix gestione reset e forzatura parametri 2021-07-28 12:55:17 +02:00
Samuele Locatelli 67ace71b4e update definizione oggetto x doppia materia prima 2021-07-28 12:41:53 +02:00
Samuele Locatelli 17aa2a0f13 fix controllo doppia MP 2021-07-28 12:41:42 +02:00
Samuele Locatelli d9505e1749 update vers number 2021-07-27 19:02:49 +02:00
Samuele Locatelli 4be174813f Merge branch 'SDK' into develop 2021-07-27 19:00:31 +02:00
Samuele Locatelli d229cc22ae Merge branch 'develop' into SDK 2021-07-27 19:00:26 +02:00
Samuele Locatelli 52fdc60ca3 COmpletata gestione deroga con visuals 2021-07-27 19:00:20 +02:00
Samuele Locatelli 9ccefa2aec Altre prove x accettazione deroghe 2021-07-27 13:29:50 +02:00
Samuele Locatelli 2036cda148 modifiche inserimento deroga ST 2021-07-27 12:29:10 +02:00
Samuele Locatelli fc29a41522 refresh 2021-07-26 12:54:07 +02:00
Samuele Locatelli fee45a430a pulizia dll 2021-07-26 12:54:00 +02:00
Samuele Locatelli 9620b51533 pulizia dll 2021-07-26 12:53:52 +02:00
Samuele Locatelli 40bd6a3fb3 cambio colore conf prod (Jetco) 2021-07-26 12:53:38 +02:00
Samuele Locatelli 262d83d2c9 Inizio modifica scheda tecnica con forzatura lotto 2021-07-26 12:53:26 +02:00
Samuele Locatelli 31ad6f0e13 Merge remote-tracking branch 'gitlab.steamware/develop' into develop 2021-07-19 17:26:51 +02:00
Samuele Locatelli cdd72b51f0 nuova icona fermo indefinito 2021-07-19 17:26:46 +02:00
Samuele E. Locatelli 0000a34abc Update css x monitor con molti blocchi 2021-07-19 16:07:36 +02:00
Samuele Locatelli 0d92b57dae Fix modalità download update MP-STATS 2021-06-28 19:43:37 +02:00
Samuele Locatelli 253fa1f808 disambiguati metodi IOB x forceAutoODL 2021-06-28 19:26:47 +02:00
Samuele Locatelli 1cb80de30b Merge branch 'feature/fixAutoStartSplitOdl' into develop 2021-06-18 19:08:16 +02:00
Samuele Locatelli b14326f2e9 update tablet x metodo split classico con nuova stored 2021-06-18 19:08:08 +02:00
Samuele Locatelli a3cf82384b Update controller MP-IO x split/autostart ODL 2021-06-18 19:07:57 +02:00
Samuele Locatelli 2ca66abf2a Update mappatura store splitODL e autoStart ODL 2021-06-18 19:07:41 +02:00
Samuele Locatelli 0eac106e8c new rel 2021-06-18 19:07:27 +02:00
Samuele Locatelli dc76218c35 Fix split con aprametri opzionali 2021-06-18 14:33:20 +02:00
Samuele Locatelli c9964da83b Merge remote-tracking branch 'gitlab.steamware/SDK' into develop 2021-06-18 14:27:54 +02:00
Samuele Locatelli e24611ef1c Merge branch 'SDK' into develop 2021-06-18 14:27:09 +02:00
Samuele Locatelli 5e5fd23480 Merge branch 'develop' into SDK 2021-06-18 14:27:04 +02:00
Samuele Locatelli ddfc5767f6 update controller x split ODL con KeyRicheista 2021-06-18 14:26:57 +02:00
Samuele Locatelli d333fd0c1a Update metodo split ODL con KeyRIcheista 2021-06-18 14:26:45 +02:00
Samuele Locatelli c901ed9829 new rel 2021-06-18 14:26:32 +02:00
Samuele E. Locatelli bc2b6367f4 Fix update manager LAND: MP-STATS --> STATS 2021-06-15 19:04:43 +02:00
Samuele Locatelli d44b214237 Modifica firma stored RS/RC get ByFilt 2021-06-09 19:00:34 +02:00
Samuele Locatelli 359ed3de61 Merge branch 'feature/UpgradeUpdateManager' into develop 2021-05-27 19:07:31 +02:00
Samuele Locatelli bba1c4cb36 new rel 2021-05-27 19:07:22 +02:00
Samuele Locatelli 10deb2efec Completato update LAND x download e mostrare STATS in home 2021-05-27 19:07:08 +02:00
Samuele Locatelli eec274ff3e OK ricerca versione x MP-STATS 2021-05-27 18:15:28 +02:00
Samuele Locatelli b172ef09bc Merge branch 'develop' into SDK 2021-05-27 17:59:49 +02:00
Samuele Locatelli 2e225d14f9 completo upgrade bootstrap 2021-05-27 17:59:11 +02:00
Samuele Locatelli b697bc20fa Update bootstrap a 4.6.0 2021-05-27 17:58:20 +02:00
Samuele Locatelli 86d7296094 update dotnetcore platform 2021-05-27 17:56:23 +02:00
Samuele Locatelli 5e64b0355f Update fontawesome 2021-05-27 17:55:44 +02:00
Samuele Locatelli 63d1f43826 update newtonsoft json 2021-05-27 17:55:03 +02:00
Samuele Locatelli 06d40eab18 Update jquery 2021-05-27 17:54:17 +02:00
Samuele Locatelli 3858969b1f Update MongoDB 2021-05-27 17:51:25 +02:00
Samuele Locatelli 0f4860ddf1 Update compress vari 2021-05-27 17:48:35 +02:00
Samuele Locatelli b4e72bae9d Update NLog 2021-05-27 17:46:02 +02:00
Samuele Locatelli 26b8cf6f9d Update steamwarelibs 2021-05-27 17:43:43 +02:00
Samuele Locatelli 7d2cbe7e59 spostamento WebConfigSetter su progetto ad hoc 2021-05-27 17:40:09 +02:00
Samuele E. Locatelli 7b513329d3 Merge branch 'develop' into SDK 2021-05-14 22:13:14 +02:00
Samuele E. Locatelli fb1413e168 Completato gestione filtraggio x Commessa/ODL dei controlli 2021-05-14 22:12:37 +02:00
Samuele E. Locatelli 88ce165544 OK filtraggio scarti 2021-05-14 22:02:55 +02:00
Samuele E. Locatelli fc1e539a51 Fix gestione grafica selettore ODL 2021-05-14 21:48:11 +02:00
Samuele Locatelli 8dd05e7375 ok selettore ultimi ODL 2021-05-14 19:57:24 +02:00
Samuele Locatelli f22a1830a7 Inizio modifica reportistica scarti 2021-05-14 19:50:29 +02:00
Samuele Locatelli 70a404ef8b Merge branch 'develop' into SDK 2021-05-12 18:29:32 +02:00
Samuele Locatelli 07fc280f01 Gestione ricerca x ARTICOLI 2021-05-12 18:28:03 +02:00
Samuele Locatelli f788926e9b Fix visibilità ricerca ADM 2021-05-12 18:00:20 +02:00
Samuele Locatelli ab2e3040bd fix comportamento tablet x perdita sel numPzPallet + display ODL 2021-05-12 17:33:44 +02:00
Samuele Locatelli e4ce734306 continuo traduzione della parte info aggiuntive 2021-05-05 15:27:31 +02:00
Samuele Locatelli 9ebaa3c731 ancora traduzioni SITE 2021-05-04 20:17:09 +02:00
Samuele Locatelli e52775e210 Completata pagina prod analisys 2021-05-04 18:39:42 +02:00
Samuele Locatelli 6bc1e86b2e traduzioni MAG 2021-05-04 18:16:03 +02:00
Samuele Locatelli f6af8daa4a Continuo traduzioni SITE 2021-05-04 18:15:33 +02:00
Samuele Locatelli 7b3ac9bdb1 continuo traduzione 2021-05-04 16:35:46 +02:00
Samuele Locatelli c5855543fc Inizio revisione traduzione 2021-05-04 16:35:39 +02:00
Samuele Locatelli 2db671aa7b new rel 2021-05-04 16:35:26 +02:00
Samuele Locatelli 03508a9beb pulizia oggetti inutilizzati 2021-05-04 16:35:10 +02:00
Samuele Locatelli df2b6ca400 Merge branch 'develop' into SDK 2021-05-03 17:48:52 +02:00
Samuele Locatelli 24516d31d9 Update x report odette 2021-05-03 17:45:11 +02:00
Samuele Locatelli a3f56546b1 new rel 1421 2021-05-03 17:45:02 +02:00
Samuele Locatelli 485315bf90 Fix gestioen stampa report full 2021-04-23 19:18:39 +02:00
Samuele Locatelli b09c626117 new rel 2021-04-23 15:42:52 +02:00
Samuele Locatelli 82ea977ff8 Merge branch 'develop' into SDK 2021-04-23 15:38:53 +02:00
Samuele Locatelli 379c431ed8 Aggiornamento stored e chiamate x nuovi reports 2021-04-23 15:38:37 +02:00
Samuele Locatelli c48482d7d3 Aggiornamento reports 2021-04-23 15:31:20 +02:00
Samuele Locatelli da10abdf57 fix controllo chiusura attrezzaggio ODL 2021-04-23 15:21:30 +02:00
Samuele Locatelli a85718e05a rimozione branch specifici x APP 2021-04-21 16:55:11 +02:00
Samuele Locatelli 7148a58176 Merge branch 'feature/FluitekReqKeyRichiesta' into develop 2021-04-21 16:53:40 +02:00
Samuele Locatelli 5e124212b6 fix display checkOdlInevaso 2021-04-21 16:53:30 +02:00
Samuele Locatelli 673ec4ffbe Fix selezione periodo controlli 2021-04-21 16:39:51 +02:00
Samuele Locatelli 5ea421afe8 Aggiunta KeyRIchiesta x ODL 2021-04-21 16:15:39 +02:00
Samuele Locatelli 313cefc9d3 fix missing file image 2021-04-21 15:06:38 +02:00
Samuele Locatelli c6ab8f2647 new rel: fix x FLuitek + check ChiudiODL Inevaso 2021-04-21 14:45:50 +02:00
Samuele Locatelli 3176888042 Merge branch 'feature/FixInterface' into develop 2021-04-21 14:42:39 +02:00
Samuele Locatelli a47034e7c8 Aggiunta preliminare report packListFull (manca check stored + veri reports) 2021-04-21 14:42:30 +02:00
Samuele Locatelli deca338d2a FIX: cancellabile SOLO SE non ho AL su ordine 2021-04-21 14:28:50 +02:00
Samuele Locatelli 5b708ff8e5 Fix filtragigo e visual richieste PackList 2021-04-21 13:15:40 +02:00
Samuele Locatelli b15847c5d0 FIx: PL trasferita NON E' editabile 2021-04-21 12:40:25 +02:00
Samuele Locatelli 9d4b54bb65 fix CBE x split (x chiedere conferma jscript) 2021-04-21 12:29:39 +02:00
Samuele Locatelli a674372de6 fix selezione task packList pedane 2021-04-21 12:29:21 +02:00
Samuele Locatelli e377d88a1b cambio traduzione x TAB (elenco stampabile) 2021-04-21 12:28:56 +02:00
Samuele Locatelli c20fa6940e Merge branch 'feature/NewPackListDuplicaUpload' into develop 2021-04-21 10:21:22 +02:00
Samuele Locatelli 7b279cb736 Aggiunta gestione split caricate 2021-04-21 10:21:12 +02:00
Samuele Locatelli 79107475fa fix update elenco packList post blocco/sblocco 2021-04-21 10:09:03 +02:00
Samuele Locatelli f53a23b009 Update elenco pedane in visualizzazione 2021-04-21 10:05:39 +02:00
Samuele Locatelli 13d4c4101e Differenziazione pag PL e Carico merce 2021-04-20 18:18:22 +02:00
Samuele Locatelli b990558813 Merge branch 'feature/PackListLogicReview' into develop 2021-04-20 17:24:05 +02:00
Samuele Locatelli 5b96ff7839 completo editing carico pedane da testare 2021-04-20 17:23:03 +02:00
Samuele Locatelli 64070bdd33 cleanup 2021-04-20 17:14:42 +02:00
Samuele Locatelli adfdf0ac10 toggler stato PL / scan carico 2021-04-20 17:14:32 +02:00
Samuele Locatelli 8c4acafadb nuovo modulo gestione load scan (da testare) 2021-04-20 17:14:19 +02:00
Samuele Locatelli 553343e2ae aggiunta desc stato AL 2021-04-20 17:12:55 +02:00
Samuele Locatelli c3cfadc8be add reset search art 2021-04-20 14:25:06 +02:00
Samuele Locatelli 241e504dba Merge branch 'feature/PackListNewInsert' into develop 2021-04-20 12:51:52 +02:00
Samuele Locatelli f7a80788cc new rel 2021-04-20 12:51:46 +02:00
Samuele Locatelli 45e6f32541 completato insert x ordini filtrabili (mass ADD) 2021-04-20 12:51:36 +02:00
Samuele Locatelli be6e5aeaf9 typo 2021-04-20 12:51:06 +02:00
Samuele Locatelli ce67ec9c19 aggiunta metodo x selezione ordini aperti filtrabili 2021-04-20 12:51:01 +02:00
Samuele Locatelli 3cc6eabdff Merge branch 'feature/BCodeReadUdc' into develop 2021-04-20 10:33:00 +02:00
Samuele Locatelli 0c6301739a cleanup generale x barcode 2021-04-20 10:23:36 +02:00
Samuele Locatelli b97664c5b7 Iniziato modifica x UDC con codice PRE; non ancora OK casi errore 2021-04-19 19:53:37 +02:00
Samuele Locatelli 3af0a646d0 Merge branch 'feature/PianoProd' into develop 2021-04-19 19:22:46 +02:00
Samuele Locatelli 4f67d80786 fix display pagina pianoprod x leggibilità e print 2021-04-19 19:22:35 +02:00
Samuele Locatelli 7ab188b900 Modifica comportamento x paginazione 2021-04-19 19:02:06 +02:00
Samuele Locatelli 144c70f8c5 Merge branch 'feature/SetupODL' into develop 2021-04-19 18:42:51 +02:00
Samuele Locatelli 8b7fe85c71 COmpletata gestione x annullamento attrezzaggio ODL 2021-04-19 18:42:34 +02:00
Samuele Locatelli 0e2e7a27a0 TAB: add reset (master/slave) x chiusura ODL 2021-04-19 17:39:32 +02:00
Samuele Locatelli 38b1d6cf13 Inizio modifica nuova vers 2021-04-19 13:14:03 +02:00
Samuele Locatelli bb6d219216 update vers numb 2021-04-13 19:53:43 +02:00
Samuele Locatelli 5e4630e845 Merge branch 'develop' into ADM 2021-04-13 19:52:53 +02:00
Samuele Locatelli de905d12d1 update librerie steamware + gestione coda con template 2021-04-13 19:52:45 +02:00
Samuele Locatelli 891d363eff Update steamware libs x template multipli x coda 2021-04-13 08:37:29 +02:00
Samuele Locatelli 22982361fd Merge branch 'develop' into TAB 2021-04-12 08:58:47 +02:00
Samuele Locatelli df33a9a981 new rel numb 2021-04-12 08:58:36 +02:00
Samuele Locatelli d9a70fc5d8 update gestione set/reset PLC x slave machine 2021-04-12 08:58:33 +02:00
Samuele Locatelli 31fb2b0909 altra pmodifica post invio parametri... 2021-04-10 15:10:50 +02:00
Samuele Locatelli f459597758 modifica metodo addTaskx non perdere in caso di task mancanti 2021-04-10 14:41:02 +02:00
Samuele Locatelli 15e1475a67 Merge branch 'beta' into ADM 2021-04-10 10:35:52 +02:00
Samuele Locatelli fedd0264b8 Aggiunto log x gestione reissue task 2021-04-10 10:34:34 +02:00
Samuele Locatelli 10c664c2d3 ulteriuore controllo variazione valore saved 2021-04-10 10:26:18 +02:00
Samuele Locatelli 895eafd8ac new rel 2021-04-10 10:21:30 +02:00
Samuele Locatelli ba168aad25 check su setObjItems e flogJson --> addCheckTask4Machine x resend PLC 2021-04-10 10:04:46 +02:00
Samuele Locatelli 4a20a5ca75 inizio modifica x gestire persistenza valori commessa x Valvital 2021-04-09 19:45:53 +02:00
Samuele Locatelli 518b24d8a0 Merge branch 'develop' into ADM 2021-04-03 17:44:22 +02:00
Samuele Locatelli 400ffcdade completo commit precedente 2021-04-03 17:44:13 +02:00
Samuele Locatelli 62db7b81cb fix reordering schedulatore 2021-04-03 17:43:56 +02:00
Samuele Locatelli 2f5a0384fd new rel 2021-03-26 18:36:00 +01:00
Samuele Locatelli 6d6ab58c63 Fix errore selezione pz pallet a 0 (log + def 1) 2021-03-26 18:35:39 +01:00
Samuele Locatelli 852ab3224e fix preproc directive 2021-03-23 14:20:02 +01:00
Samuele Locatelli 0fad61aca3 update x gestione vocabolario 2021-03-23 14:18:03 +01:00
Samuele Locatelli 86b2a79f2b Merge branch 'develop' into ADM 2021-03-17 16:56:47 +01:00
Samuele Locatelli 46dee623c3 COmpletato fix comportamento update statistiche in modifica 2021-03-17 16:56:41 +01:00
Samuele Locatelli 4af6a150ba update ADM: nascosto "solo programmate" 2021-03-17 16:37:42 +01:00
Samuele Locatelli 2409b14258 new rel number 2021-03-17 16:37:23 +01:00
Samuele Locatelli 15b703d04d refresh compression 2021-03-17 16:37:13 +01:00
Samuele Locatelli 809d2f2972 refresh typescrypt vers 2021-03-17 16:36:47 +01:00
Samuele Locatelli 608fa1bad9 fix framework x versGen 2021-03-17 16:36:33 +01:00
Samuele E. Locatelli bd70933212 Rimosso selezione impianti doppia tavola 2021-03-16 17:07:11 +01:00
Samuele E. Locatelli 6b43dc13ac update vers number 2021-03-16 16:25:30 +01:00
Samuele E. Locatelli 99643ea88a Merge branch 'develop' into ADM 2021-03-16 12:56:31 +01:00
Samuele E. Locatelli a32c7c6ffb aggiunto step x assegnazioen amcchina attività pianificate 2021-03-16 12:56:04 +01:00
Samuele E. Locatelli 96992db9a2 new release 2021-03-16 12:55:47 +01:00
Samuele E. Locatelli cd9fc076fb rimesso update eliminato x stats + update approvazione 2021-03-16 09:32:57 +01:00
Samuele E. Locatelli 3d75d63b86 refresh pacchetti nuget 2021-03-16 09:31:09 +01:00
Samuele E. Locatelli 2577812529 Merge branch 'develop' into ADM 2021-03-15 19:13:27 +01:00
Samuele E. Locatelli b5bcc066b1 fix perdita selezione su cambio priorità 2021-03-15 19:11:57 +01:00
Samuele E. Locatelli dfe39961cd pulizia library 2021-03-15 19:09:31 +01:00
Samuele E. Locatelli 297f6635a4 ok condizioni visualizzaizone spostamento priorità 2021-03-15 19:06:54 +01:00
Samuele E. Locatelli 0a9b07fb9a spostamento procedura plan (preliminare) 2021-03-15 19:06:43 +01:00
Samuele E. Locatelli 37a8f50b98 start new rel 2021-03-15 19:06:30 +01:00
Samuele E. Locatelli a3f05ea053 fix pulsanti riattrezzaggio 2021-03-09 17:17:57 +01:00
Samuele E. Locatelli 42a6484136 Merge branch 'develop' into ADM 2021-03-09 12:35:10 +01:00
Samuele E. Locatelli b97f1da062 controllo x evitare doppio caricamento ordini ext 2021-03-09 12:35:04 +01:00
Samuele E. Locatelli c1eaf40003 Merge branch 'develop' into MAG 2021-03-09 12:25:21 +01:00
Samuele E. Locatelli 544f4309aa update MAG x ordini: aggiunto cliente+destinazione 2021-03-09 12:25:13 +01:00
Samuele E. Locatelli 6fc1c831ff PackList MAG: data consegna + destinazione 2021-03-05 10:24:59 +01:00
Samuele E. Locatelli 3c6c506330 pulizia dll 2021-03-05 09:45:37 +01:00
Samuele E. Locatelli 558de1eae4 Merge branch 'develop' into MAG 2021-03-04 15:58:51 +01:00
Samuele E. Locatelli 258d00e87c rel 1400 2021-03-04 15:58:35 +01:00
Samuele E. Locatelli 295d581242 ulteriore pulizia nuget 2021-03-04 15:58:21 +01:00
Samuele E. Locatelli e737812e81 Pulizia nuget deprecati in SDK e update 2021-03-04 15:42:13 +01:00
Samuele E. Locatelli 15345ddd0f Fix zlib/snappy spariti 2021-03-04 14:41:16 +01:00
Samuele E. Locatelli 408e5cf431 Fix setup progetti con dll referenziate x errore 2021-03-04 14:35:14 +01:00
Samuele E. Locatelli 926e94a54e new rel 2021-03-04 12:36:13 +01:00
Samuele E. Locatelli 982eef601d Merge branch 'ADM' into develop 2021-03-04 12:36:00 +01:00
Samuele E. Locatelli 3a41672364 fix DueDate x promesse ODL 2021-03-04 12:35:33 +01:00
Samuele E. Locatelli e24ca7a9dc Merge branch 'develop' into TAB 2021-03-04 11:39:34 +01:00
Samuele E. Locatelli 2b9749253b OK Tab x gestione selezione filtro 2021-03-04 11:39:26 +01:00
Samuele E. Locatelli 9af9253aa5 modifica x selettore PODL come NUOVO componente 2021-03-04 11:03:23 +01:00
Samuele E. Locatelli fb48cbe10e Merge branch 'develop' into ADM 2021-03-04 09:48:30 +01:00
Samuele E. Locatelli 774d3b3002 update interop services 2021-03-04 09:46:39 +01:00
Samuele E. Locatelli 0cc58431bf new rel 2021-03-04 09:22:47 +01:00
Samuele E. Locatelli 88529888b5 Refresh pacchetti 2021-03-04 09:22:28 +01:00
Samuele E. Locatelli a1fb3b1100 Update Nuget ultime versioni step 2 2021-03-04 08:27:07 +01:00
Samuele E. Locatelli e8488da7d0 Update Nuget ultime versioni step 1 2021-03-04 08:16:09 +01:00
Samuele E. Locatelli 7ca2967615 ancora consolidamento nuget vari 2021-03-04 08:11:26 +01:00
Samuele E. Locatelli b2d597e903 update e consolidamento NuGet vari 2021-03-04 08:07:31 +01:00
Samuele E. Locatelli 59abf7f29d cambio livello verbosity 2021-03-03 16:06:20 +01:00
Samuele E. Locatelli 02838336cf Merge branch 'develop' into ADM 2021-03-03 15:57:24 +01:00
Samuele E. Locatelli 8db3676637 COmpletata review x diminuire verbosità compilazione 2021-03-03 15:57:06 +01:00
Samuele E. Locatelli b9a98c23f6 start new rel cycle 2021-03-03 12:51:15 +01:00
Samuele E. Locatelli 3395c52275 Fix nuget: bootstrap, ZipLib,DnsClient,Steamware 2021-03-03 12:51:09 +01:00
Samuele E. Locatelli 2151aa87fa fix errori compilazione MAG 2021-03-03 12:42:02 +01:00
Samuele E. Locatelli a8e8b97acb fix errori compilazione ADM IO LAND 2021-03-03 12:41:31 +01:00
Samuele E. Locatelli 0667ec7f06 fix progetti classLibrary 2021-03-03 12:41:13 +01:00
Samuele E. Locatelli bcdb82da1b Fix preliminari x .editorconfig files 2021-03-03 12:40:56 +01:00
Samuele E. Locatelli 2e7c455772 fix gitspread 2021-03-03 10:55:10 +01:00
Samuele E. Locatelli 982269d7f2 fix gitspread e jenkinsfile 2021-03-03 10:02:27 +01:00
Samuele E. Locatelli fc43568ef6 sistemazione grafica fixODL 2021-03-03 09:45:41 +01:00
Samuele E. Locatelli e13eec451d Merge branch 'MAG' into develop 2021-03-02 19:00:18 +01:00
Samuele E. Locatelli ff46190969 selezione ODL DueDate entro parametro config 2021-03-02 18:59:37 +01:00
Samuele E. Locatelli 8a59e8a0cf new rel 2021-03-02 18:54:07 +01:00
Samuele E. Locatelli feedb5a168 fix typo x LAND/MAG 2021-02-10 14:46:07 +01:00
Samuele E. Locatelli eb1a3e885b Merge branch 'MAG' into ADM 2021-02-05 19:28:59 +01:00
Samuele E. Locatelli 8847b8e316 new rel 2021-02-05 19:28:52 +01:00
Samuele E. Locatelli 8a7d2a8472 fix logo cliente + fix gest MON + macc 2021-02-05 19:28:43 +01:00
Samuele E. Locatelli 59695fb3db Merge branch 'MAG' into ADM 2021-02-04 09:19:19 +01:00
Samuele E. Locatelli ac1108a207 Gestione timer variabile in pedane 2021-02-04 09:18:41 +01:00
Samuele E. Locatelli 7059b75f00 fix gestione pedane x traduzione + TTL prod redis 2021-02-02 15:58:22 +01:00
Samuele E. Locatelli 6541aee699 fix reset 2021-02-02 15:58:12 +01:00
Samuele E. Locatelli 9ffa78f4dc Merge branch 'MAG' into ADM 2021-02-02 09:01:53 +01:00
Samuele E. Locatelli da67a40750 new rel 2021-02-02 09:01:45 +01:00
Samuele E. Locatelli efdb05c638 fix comportamento lock/unlock selezione packlist da processare 2021-02-02 09:01:19 +01:00
Samuele E. Locatelli fbc5ba59b1 new rel 2021-02-01 19:36:11 +01:00
Samuele E. Locatelli 573f155449 NO delete PList SE AL presenti, anche se bozza... 2021-02-01 19:36:05 +01:00
Samuele E. Locatelli bcd7e4402a Merge branch 'MAG' into ADM 2021-02-01 16:48:19 +01:00
Samuele E. Locatelli 33a7a746ad new rel 2021-02-01 16:48:12 +01:00
Samuele E. Locatelli d6f1e05d7e Fix font x LAND 2021-02-01 16:48:04 +01:00
Samuele E. Locatelli 2a60dc10e9 Merge branch 'MAG' into ADM 2021-02-01 15:40:28 +01:00
Samuele E. Locatelli a2bc0e4573 new rel 2021-02-01 15:40:22 +01:00
Samuele E. Locatelli d78c9a7cca update x test css LAND + fix import SQL tutot con null 2021-02-01 15:40:09 +01:00
Samuele E. Locatelli 42b7fc47e3 refresh build LAND in test 2021-02-01 15:24:12 +01:00
Samuele E. Locatelli c6eea9451d Merge branch 'ADM' into MAG 2021-02-01 15:11:18 +01:00
Samuele E. Locatelli 733d197438 update vers 2021-02-01 15:11:13 +01:00
Samuele E. Locatelli ae0a0b0dd6 Merge branch 'MAG' into ADM 2021-02-01 15:10:58 +01:00
Samuele E. Locatelli b86512380e Aggiunto ricerca articoli in ES3 x cod + IMPORT 2021-02-01 15:10:51 +01:00
Samuele E. Locatelli c5a5c480c1 fix configuraizone x font custom + new rel 2021-02-01 13:34:43 +01:00
Samuele E. Locatelli cedc18bb04 Merge branch 'MAG' into ADM 2021-02-01 13:28:09 +01:00
Samuele E. Locatelli d0c27f8e3f Completato fix vari x pagina MAG 2021-02-01 13:28:03 +01:00
Samuele E. Locatelli b397b9b5da Fix controllo qta ODL 2021-02-01 12:47:58 +01:00
Samuele E. Locatelli 56f32e3fda Fix vari apgine packList e pedane 2021-02-01 12:16:07 +01:00
Samuele E. Locatelli d31559f1ec Fix gestione creazione/editing PackList 2021-01-30 11:44:34 +01:00
Samuele E. Locatelli 7862ba3284 new Rel 2021-01-29 19:54:39 +01:00
Samuele E. Locatelli e0a88154a2 fix display codArt x PackList 2021-01-29 19:54:26 +01:00
Samuele E. Locatelli 132cd7a35f Merge branch 'MAG' into ADM 2021-01-29 19:46:21 +01:00
Samuele E. Locatelli 9722a19b54 Fix update e svuota x UDC/AL 2021-01-29 19:45:28 +01:00
Samuele E. Locatelli 247c5a91f2 OK eliminazione pedane vuote... 2021-01-29 19:19:48 +01:00
Samuele E. Locatelli 04aa98427f new rel 2021-01-29 18:59:13 +01:00
Samuele E. Locatelli c9964bb61f Aggiunta pack list start/compeltata x MAG 2021-01-29 18:59:00 +01:00
Samuele E. Locatelli d9fef0bea7 Merge branch 'ADM' into MAG 2021-01-28 22:57:44 +01:00
Samuele E. Locatelli 702a3406e3 FIX stampa pedane!!! 2021-01-28 22:57:33 +01:00
Samuele E. Locatelli 8afbd9330f fix pagina print con selezione ultimi ODL 2021-01-28 22:37:16 +01:00
Samuele E. Locatelli bc02204846 fix conf report + update rdlc corretto 2021-01-28 22:37:03 +01:00
Samuele E. Locatelli e5b10affae aggiunta gestione lista ODL 2021-01-28 22:36:19 +01:00
Samuele E. Locatelli 03c9f10b01 typo 2021-01-28 17:44:18 +01:00
Samuele E. Locatelli 19ad903da0 Fix ricalcolo promIN processate + fix pulizia promIN da apertura planner 2021-01-28 08:57:48 +01:00
Samuele E. Locatelli 6691fb2207 new rel packages 2021-01-27 18:40:12 +01:00
Samuele E. Locatelli 5698a88d53 Merge branch 'ES3' into TAB 2021-01-27 18:30:34 +01:00
Samuele E. Locatelli 2dcaa77205 Completato comportamento ADM x ES3!!! 2021-01-27 18:30:26 +01:00
Samuele E. Locatelli 54a3e74bd1 Fix query stat x attive/inattive 2021-01-27 18:16:25 +01:00
Samuele E. Locatelli e1861674a1 fix vari + loop errore update 2021-01-27 17:32:49 +01:00
Samuele E. Locatelli 2d18d5dd65 Completata gestioen attiva/disattiva/elimina PODL 2021-01-27 16:25:38 +01:00
Samuele E. Locatelli 91ec2da52a fix filtraggio promesse attivate 2021-01-27 15:09:36 +01:00
Samuele E. Locatelli 10f8e6a344 update pagina ODL OUT 2021-01-27 12:33:33 +01:00
Samuele E. Locatelli 4b1d694d77 fixed refresh 2021-01-27 11:47:28 +01:00
Samuele E. Locatelli 8378f641db fix editing promesse pianificate 2021-01-27 11:02:30 +01:00
Samuele E. Locatelli 161f392b71 spostamento modulo a nuova denominazione 2021-01-27 08:21:57 +01:00
Samuele E. Locatelli 3d1c083a63 inizio riorganizzaizone ultimo modulo 2021-01-27 08:15:59 +01:00
Samuele E. Locatelli 249a4e76ac new rel 2021-01-26 19:39:47 +01:00
Samuele E. Locatelli a0c89706de molti update x gestione pianificazione produzione (anche parziale) 2021-01-26 19:39:38 +01:00
Samuele E. Locatelli 8bfbe7b2f5 fix selezione approvazione 2021-01-23 09:45:08 +01:00
Samuele E. Locatelli 1521ee7376 renaming compone te create -- approve 2021-01-23 09:05:17 +01:00
Samuele E. Locatelli b38ee75c7b renaming mod --> cmp stats 2021-01-23 09:03:25 +01:00
Samuele E. Locatelli 3851628ba0 fix comportamento selezione --> detail 2021-01-23 09:00:23 +01:00
Samuele E. Locatelli b2a0649f1e Fix grafico selezione candidati x create 2021-01-22 19:29:51 +01:00
Samuele E. Locatelli 38af19e6d0 fix graph ricerca 2021-01-22 19:17:19 +01:00
Samuele E. Locatelli 16ce89bf33 Completato filtro anche con CLIENTI 2021-01-22 19:09:10 +01:00
Samuele E. Locatelli 5c4952d9ce spostsamento filtro ART in componente 2021-01-22 08:38:01 +01:00
Samuele E. Locatelli 9f3a8a756b fix selezione e reset x macchine/reparti 2021-01-21 19:03:16 +01:00
Samuele E. Locatelli a01bfd1079 new rel 2021-01-21 18:14:15 +01:00
Samuele E. Locatelli 8c205a5849 Creazione moduli individuali x plan ES3 2021-01-21 18:13:54 +01:00
Samuele E. Locatelli 0a0ab3424b update report scassato + conf 2021-01-16 12:33:15 +01:00
Samuele E. Locatelli a30f1bfa23 Merge branch 'ADM' into MAG 2021-01-16 12:08:37 +01:00
Samuele E. Locatelli 6025d775db fix mag base path 2021-01-16 12:08:29 +01:00
Samuele E. Locatelli f847eaf82c Merge branch 'ADM' into ES3 2021-01-16 12:01:58 +01:00
Samuele E. Locatelli a2402f8636 typo + refresh jumper/smartStart x MAG 2021-01-16 12:01:48 +01:00
Samuele E. Locatelli ddf935c944 add report packlist rdlc 2021-01-16 12:01:31 +01:00
Samuele E. Locatelli 8e7fb2c3a8 new rel 2021-01-16 12:01:08 +01:00
Samuele E. Locatelli 19079f0b73 refresh conf jump x MAG 2021-01-16 10:29:03 +01:00
Samuele E. Locatelli 5651dd5d88 Merge branch 'MAG' into ADM 2021-01-16 10:05:42 +01:00
Samuele E. Locatelli ddd21ac607 update gestione DB recupero chaivi JUMP 2021-01-16 10:05:05 +01:00
Samuele E. Locatelli 0670533ef8 Merge branch 'MAG' into ADM 2021-01-15 19:52:11 +01:00
Samuele E. Locatelli d4104d4176 fix redirect da provare x MAG + new rel 2021-01-15 19:52:02 +01:00
Samuele E. Locatelli 6a45034910 URL jump TAB-->MAG tab da testare 2021-01-15 19:49:00 +01:00
Samuele E. Locatelli 578b4a92fc fix report pedane (conf x stampa) 2021-01-15 19:43:42 +01:00
Samuele E. Locatelli 242edd80e2 typo 2021-01-15 19:28:56 +01:00
Samuele E. Locatelli ef912aab1d add new report 2021-01-15 19:28:50 +01:00
Samuele E. Locatelli 47dcde809f Merge branch 'MAG' into ADM 2021-01-15 10:32:24 +01:00
Samuele E. Locatelli f5f25033f3 modifica preliminare x report packlist (buttons) 2021-01-15 10:32:06 +01:00
Samuele E. Locatelli 7710017590 new release 2021-01-13 22:30:05 +01:00
Samuele E. Locatelli 64b521b5ce refresh LAND 2021-01-13 22:30:00 +01:00
Samuele E. Locatelli cf263e14f2 aggiunta font x LAND 2021-01-13 22:29:45 +01:00
Samuele E. Locatelli c15d930b53 Merge branch 'MAG' into ADM 2021-01-13 19:55:54 +01:00
Samuele E. Locatelli 78bb99dbc8 aggiunto download MAG in coda ad ALL 2021-01-13 19:55:47 +01:00
Samuele E. Locatelli 9cb2fa8bd8 fix lettura da key e non cablata CTRACK 2021-01-13 19:55:01 +01:00
Samuele E. Locatelli 4aea6a23ca fix btn download e link x MAG 2021-01-13 19:53:11 +01:00
Samuele E. Locatelli b7780aa526 fix link stampa TAB 2021-01-13 19:02:18 +01:00
Samuele E. Locatelli d46a78f923 nuova rel x fix json MAG e x varie TAB 2021-01-13 18:40:36 +01:00
Samuele E. Locatelli 191d2b3887 fix deploy rdlc 2021-01-13 18:39:47 +01:00
Samuele E. Locatelli 54dabfada0 Merge branch 'MAG' into ADM 2021-01-13 16:21:00 +01:00
Samuele E. Locatelli c88093a2cf update x gestione pedane... 2021-01-13 16:19:10 +01:00
Samuele E. Locatelli 26b86f6f20 refresh dati stampa x UDC 2021-01-13 14:08:36 +01:00
Samuele E. Locatelli 47ddb7498b fix conteggio pezzi stampabili 2021-01-13 13:52:11 +01:00
Samuele E. Locatelli c05e542e5b inizio modifica x pezzi confermati vs ordinati 2021-01-13 12:16:34 +01:00
Samuele E. Locatelli e00b47ffe5 refresh pubblicaizone reports 2021-01-13 11:20:50 +01:00
Samuele E. Locatelli f2b6d1da5f udpate report + pubblicazione rdlc 2021-01-13 11:15:32 +01:00
Samuele E. Locatelli 7c8e35e987 new rel number 2021-01-13 11:02:00 +01:00
Samuele E. Locatelli 037d673b8a Update gestione PJQ come x NKC 2021-01-13 11:01:33 +01:00
Samuele E. Locatelli 4b56919704 new rel 2021-01-13 09:38:14 +01:00
Samuele E. Locatelli a9bacff235 Update conf code stampa MAG + reprint 2021-01-13 09:38:04 +01:00
Samuele E. Locatelli 903a541efa Merge branch 'MAG' into ADM 2021-01-12 19:56:01 +01:00
Samuele E. Locatelli f296857476 OK creazione ed accodamento UDC!!! 2021-01-12 19:55:55 +01:00
Samuele E. Locatelli cb0608bed4 new rel 2021-01-12 19:43:13 +01:00
Samuele E. Locatelli f794344ba4 fix errore init currData 2021-01-12 19:43:00 +01:00
Samuele E. Locatelli 9edb83e838 completata gestione stampa, DA PROVARE!!!! 2021-01-12 19:42:01 +01:00
Samuele E. Locatelli 458f8c32af struttura buttons x printing 2021-01-12 08:38:21 +01:00
Samuele E. Locatelli dd9c6d16ee Appunti stampa 2021-01-11 19:32:46 +01:00
Samuele E. Locatelli 122b5703b6 Merge branch 'TAB' into MAG 2021-01-11 19:21:59 +01:00
Samuele E. Locatelli 1e83a56e68 Test OK x redirect Jumper 2021-01-11 19:21:42 +01:00
Samuele E. Locatelli 43bc89406a fix favicon 2021-01-11 19:20:14 +01:00
Samuele E. Locatelli 696dc6485c review procedura jumper con controllo 2021-01-11 19:05:39 +01:00
Samuele E. Locatelli 333ccb607b inizio next rel x fix stsampe 2021-01-05 19:17:31 +01:00
Samuele E. Locatelli ee8519fd64 Merge branch 'TAB' into ES3 2021-01-05 19:14:53 +01:00
Samuele E. Locatelli b3f2b95013 COmpletato fix compoertamento atrezzaggio ODL con scheda tecn 2021-01-05 19:14:36 +01:00
Samuele E. Locatelli c451491c7c fix riattrezzaggio x gestione lotti scheda tecnica 2021-01-05 18:44:48 +01:00
Samuele E. Locatelli b8415b6898 Merge branch 'ADM' into TAB 2021-01-05 18:16:16 +01:00
Samuele E. Locatelli db2b3d4f20 fix messaggio errore COPY/PASTE 2021-01-05 18:16:10 +01:00
Samuele E. Locatelli fde9145884 Fix errore MP-IO x split ODL full 2021-01-05 17:39:45 +01:00
Samuele E. Locatelli a4bbd6ecbd Merge branch 'TAB' into ES3 2021-01-05 15:24:14 +01:00
Samuele E. Locatelli 23216fa368 fix sel schedatec x TAB 2021-01-05 15:08:46 +01:00
Samuele E. Locatelli 39f6b536c1 completata gestione editing COPY/PASTE x Scheda Tecn ADM 2021-01-05 15:00:20 +01:00
Samuele E. Locatelli 36822c2a6b completata gestione copy/paste schede 2021-01-05 12:20:09 +01:00
Samuele E. Locatelli da6b36a74f Merge branch 'ES3' into ADM 2021-01-05 10:40:44 +01:00
Samuele E. Locatelli 74a3a96521 Merge branch 'ADM' into ES3 2021-01-05 10:40:40 +01:00
Samuele E. Locatelli d81b9ac459 Compeltata gestione nuova scheda tecnica 2021-01-05 10:40:34 +01:00
Samuele E. Locatelli cac4456484 start rel 2021-01-05 07:49:42 +01:00
Samuele E. Locatelli 3f6d25fca6 refresh grafico... 2021-01-04 19:45:49 +01:00
Samuele E. Locatelli a9f4ffe968 Start nerw rel vers 2021-01-04 19:40:03 +01:00
Samuele E. Locatelli 252c584852 Merge branch 'ADM' into ES3 2021-01-04 19:39:34 +01:00
Samuele E. Locatelli ddd34045aa Completata sel immagine da elenco links 2021-01-04 19:39:28 +01:00
Samuele E. Locatelli c69aaef30f update x gestione selettore img 2021-01-04 19:23:30 +01:00
Samuele E. Locatelli 83c5519680 Fix gestione scheda tech preview/editing 2021-01-04 18:15:26 +01:00
Samuele E. Locatelli 6f360fcd4f Fix comportamento edit/preview STech 2021-01-04 17:56:27 +01:00
Samuele E. Locatelli ac49aab21f update preview ST (TAB --> edit) 2021-01-04 17:48:49 +01:00
Samuele E. Locatelli 10bb217b67 inizio add ST preview (TAB) 2021-01-04 16:51:48 +01:00
Samuele E. Locatelli ec31963f00 Aggiunta preliminare visualizzatore immagini x allegati schede tecniche 2021-01-04 15:42:43 +01:00
Samuele E. Locatelli 7d3aafa9f5 COmpletato editing di base x scheda tecnica 2021-01-04 13:15:59 +01:00
Samuele E. Locatelli 79691ed1be completata prima apssata editing scheda tecnica (delete/merge) 2021-01-04 12:47:24 +01:00
Samuele E. Locatelli e434c067aa gestione validazione ST 2021-01-04 10:55:37 +01:00
Samuele E. Locatelli 3e637184cc new rel number x prox versione 2021-01-02 13:06:37 +01:00
Samuele E. Locatelli 67d98513b4 update gitspread x branch TAB e ADM 2021-01-02 13:04:53 +01:00
Samuele E. Locatelli 5a0aee4ab3 Merge branch 'ADM' into ES3 2021-01-02 13:03:29 +01:00
Samuele E. Locatelli be909d0e74 Bopzza dettaglio dati scheda tecnica 2021-01-02 13:03:22 +01:00
Samuele E. Locatelli bc7d862e00 Aggiunta selezione testate schede tecniche 2021-01-02 12:34:26 +01:00
Samuele E. Locatelli 2d9b074acb segnaposto pagina TechSheetMan 2021-01-02 11:52:36 +01:00
Samuele E. Locatelli 442fc46c20 Inizio modifica area ADM x editing scheda tecnica 2021-01-02 11:42:47 +01:00
Samuele E. Locatelli f8d7530b63 revisione jumper x MAG (NON completata) 2021-01-02 10:38:44 +01:00
Samuele E. Locatelli 9a101a3900 revisione metodo jumper x TAB 2021-01-02 10:38:26 +01:00
Samuele E. Locatelli 73b29deedf cambio link rimbalzo print, OK!!! 2020-12-31 17:02:24 +01:00
Samuele E. Locatelli cfc22d308f typo 2020-12-31 15:27:40 +01:00
Samuele E. Locatelli daaa1050d0 cambio link rimbalzo print 2020-12-31 15:26:00 +01:00
Samuele E. Locatelli f912174b25 Aggiunto branch x TAB x testare link stampa... 2020-12-31 15:21:01 +01:00
Samuele E. Locatelli b8fdbf3350 update vers number release 1354 2020-12-31 14:57:58 +01:00
Samuele E. Locatelli caf02d66be Fix x beta (release MAG con changelog & co) 2020-12-31 14:57:34 +01:00
Samuele E. Locatelli 00bffee3d6 Merge branch 'MAG' into SDK 2020-12-31 13:51:45 +01:00
Samuele E. Locatelli 1e8472219d inclusione publish profiles esclusi x IIS01/02 2020-12-31 13:48:48 +01:00
Samuele E. Locatelli 5e5a1873f3 rel 1353 2020-12-31 13:45:03 +01:00
Samuele E. Locatelli 16bc49560d Merge branch 'MAG' into ES3 2020-12-31 13:44:27 +01:00
Samuele E. Locatelli 013d2499de Fix gitSpread + install IIS01 single branch push 2020-12-31 13:43:34 +01:00
Samuele E. Locatelli 3e71e13d16 fix typo variabili ENV x Jenkins 2020-12-31 13:40:31 +01:00
Samuele E. Locatelli 3cfc979fe9 typo fix jenkinsfile 2020-12-31 13:34:25 +01:00
Samuele E. Locatelli 60f0664595 Merge branch 'MAG' into ES3 2020-12-31 13:02:06 +01:00
Samuele E. Locatelli 5bd4b7603c update gitspread + inizio jenkins x MAG 2020-12-31 13:00:45 +01:00
Samuele E. Locatelli 3ddc7fddc5 Review procedura login senza cookie x IIS01/IIS02 2020-12-31 12:18:27 +01:00
Samuele E. Locatelli ce3d21f84e typo e refactor alcuni metodi TAB 2020-12-31 12:01:34 +01:00
Samuele E. Locatelli 086a5a1eda Fix procewdura login x MAG (stile TAB) 2020-12-31 12:01:17 +01:00
Samuele E. Locatelli 35ccf151ae refresh conf x MP generale 2020-12-31 10:36:13 +01:00
Samuele E. Locatelli 22e4dcb641 nuova sol x MP MAG 2020-12-31 10:36:06 +01:00
Samuele E. Locatelli 8da093dd90 Nuova soluzione x webconfigsetter 2020-12-31 10:35:56 +01:00
Samuele E. Locatelli 9b4293b5b6 Aggiunta preliminare MP-MAG 2020-12-31 10:35:24 +01:00
Samuele E. Locatelli 2ed4b6e6f3 Aggiunta preliminare progetto MagData 2020-12-31 10:35:11 +01:00
Samuele E. Locatelli 38150e3ff2 fix init dataLayer se param timeout mancasse 2020-12-31 10:34:52 +01:00
Samuele E. Locatelli 00d5800c94 Merge branch 'develop' into ES3 2020-12-16 18:21:17 +01:00
Samuele E. Locatelli e11f95679b Fix messaggio x lotti non richiesti TAB - 1351 2020-12-16 18:20:58 +01:00
Samuele E. Locatelli 37f5443d46 aggiunta conf Valvital 2020-12-16 17:25:55 +01:00
Samuele E. Locatelli a72dcaf6ce update conf di riferimento 2020-12-16 17:18:28 +01:00
Samuele E. Locatelli 88aa3d5032 Merge branch 'develop' into ES3 2020-12-16 17:08:08 +01:00
Samuele E. Locatelli e88ffe2cf8 vers 1350 2020-12-16 17:07:44 +01:00
Samuele E. Locatelli 77c412e90e fix gestione oggetti Entity x nuovo naming x sostituzione 2020-12-16 17:07:29 +01:00
Samuele E. Locatelli 94c4430ae6 fix conf visualizzazione minuti durata 2020-12-16 17:07:11 +01:00
Samuele E. Locatelli cf855e5df7 start fix MP-MON 2020-12-16 16:48:39 +01:00
Samuele E. Locatelli f8bc3c7799 Merge branch 'develop' into ES3 2020-12-16 12:25:27 +01:00
Samuele E. Locatelli a5ea45b07c new rel 2020-12-16 12:25:20 +01:00
Samuele E. Locatelli a63b467c10 modifiche x update ODL in cascata x VALVITAL 2020-12-16 12:22:35 +01:00
Samuele E. Locatelli b087fbabc8 update steamwarelibs 750 + dati browser 2020-12-16 12:22:26 +01:00
Samuele E. Locatelli 7fd9cf717f refresh steamwarelibs (749) 2020-12-16 10:57:11 +01:00
Samuele E. Locatelli 587616f319 fix about & info page x TAB 2020-12-16 10:56:58 +01:00
Samuele E. Locatelli 31184c919d eòliminazione dll inutili 2020-12-16 10:19:45 +01:00
Samuele E. Locatelli 63c764e400 aggiornamento WebConfigSetter 2020-12-16 07:31:05 +01:00
Samuele E. Locatelli 49268123bb ver 1348 2020-12-15 15:58:30 +01:00
Samuele E. Locatelli 07b9cd99e4 update calcolo post insert da tablet eventi 2020-12-15 15:58:12 +01:00
Samuele E. Locatelli 9424fe273f Merge branch 'ES3' into develop 2020-12-14 19:02:36 +01:00
Samuele E. Locatelli a3b5ba38f2 Merge branch 'develop' into ES3 2020-12-14 19:02:31 +01:00
Samuele E. Locatelli c9893a4cbf new rel con fix x ScheaTecnica x display post setup ODL 2020-12-14 19:02:23 +01:00
Samuele E. Locatelli 1b9517df64 Fix gestione update ODL x SheetTech in fase di setup 2020-12-14 19:00:23 +01:00
Samuele E. Locatelli 5e5faecc1b pulizia dll da TAB 2020-12-14 17:08:31 +01:00
Samuele E. Locatelli 43b6b14c4d Merge branch 'develop' into Giancarlo 2020-12-14 17:03:04 +01:00
Samuele E. Locatelli 16064053e0 fix WebConfigSettings 2020-12-14 17:02:44 +01:00
Samuele E. Locatelli e7235bd95b refresh web.config 2020-12-14 16:28:17 +01:00
Samuele E. Locatelli 265fe0d71c Fix conf x anagrafica in test IIS01/IIS02 2020-12-14 16:27:09 +01:00
Samuele E. Locatelli ca35b77570 fix deploy IIS01/02 tra beta e master 2020-12-14 15:53:58 +01:00
Samuele E. Locatelli d53a170988 Merge branch 'develop' into Giancarlo 2020-12-14 15:46:30 +01:00
Samuele E. Locatelli 4ce6fd85c7 update LAND x HwSwInfo con DB compreso 2020-12-14 15:46:21 +01:00
Samuele E. Locatelli 9351000cb9 eliminato step: pubblico a mano!!! 2020-12-14 15:14:21 +01:00
Samuele E. Locatelli cc13a02677 add deploy WebConfigSetter su Nexus 2020-12-14 15:12:03 +01:00
Samuele E. Locatelli f933f3a106 update conf WebConfigSetter 2020-12-14 15:06:11 +01:00
Samuele E. Locatelli 808e90d9d5 Merge branch 'ES3' into Giancarlo 2020-12-14 13:00:55 +01:00
Samuele E. Locatelli 43697de586 Fix WebConfigSetter 2020-12-14 13:00:38 +01:00
Samuele E. Locatelli 4ddf26fc48 fix conf e procedura di modifica (primo test) 2020-12-14 12:11:25 +01:00
Samuele E. Locatelli 7176c245d6 continuo sviluppo... 2020-12-14 11:27:40 +01:00
Samuele E. Locatelli 7166d29829 Aggiunte conf varie 2020-12-14 11:27:34 +01:00
Samuele E. Locatelli 8786864cc0 Bozza gestione lettura conf 2020-12-11 17:40:12 +01:00
Samuele E. Locatelli 37bb6236b5 Merge branch 'develop' into ES3 2020-12-10 16:16:11 +01:00
Samuele E. Locatelli 6d8616870a new rel 2020-12-10 16:15:57 +01:00
Samuele E. Locatelli 6cfeefcfc9 Fix MP ADM x gestione anagrafica articoli con filtro a capo + speedup paged data 2020-12-10 16:14:53 +01:00
Samuele E. Locatelli 5db36a6467 new rel 2020-12-10 15:40:54 +01:00
Samuele E. Locatelli 111067b422 update checlk TAB x immagini scheda tecnica 2020-12-10 15:40:18 +01:00
Samuele E. Locatelli d152641627 Merge branch 'develop' into Giancarlo 2020-12-10 11:43:45 +01:00
Samuele E. Locatelli a97806350b update vers numb 2020-12-10 11:43:39 +01:00
Samuele E. Locatelli 8de2fea220 fix chiamata update lotti da ODL x TAB 2020-12-10 11:43:35 +01:00
Samuele E. Locatelli 7752a776a0 fix trim x prom ODL in ADM 2020-12-09 18:03:34 +01:00
Samuele E. Locatelli eb5436bfd3 start new rel 2020-12-09 18:03:25 +01:00
Samuele E. Locatelli 6785688a07 Merge branch 'develop' into ES3 2020-12-09 17:49:06 +01:00
Samuele E. Locatelli 049efb1b01 Fix vari x SchedaTecnica 2020-12-09 17:48:55 +01:00
Samuele E. Locatelli 7db6b6f9a1 Fix check controllo LOTTI x ODL 2020-12-09 15:08:17 +01:00
Samuele E. Locatelli 6817de4e5a start rel 1341 2020-12-09 14:20:55 +01:00
Samuele E. Locatelli 65437bf191 update x gestione metodi opzionali da DB 2020-12-09 14:20:42 +01:00
Samuele E. Locatelli 8a6856fc26 Aggiunta nuovo DS x MAG 2020-12-09 14:20:26 +01:00
Samuele E. Locatelli 1ec4f1b3ac Merge branch 'develop' into ES3 2020-12-09 10:09:03 +01:00
Samuele E. Locatelli 8f40091e6c fix stored x SchedaTecnica 2020-12-09 10:08:43 +01:00
Samuele E. Locatelli 8a58da72f6 Merge branch 'Giancarlo' into ES3 2020-12-03 19:06:01 +01:00
Samuele E. Locatelli fb38f15631 update vers 2020-12-03 19:05:38 +01:00
Samuele E. Locatelli 6182ee95a5 update gestione visibilità reset 2020-12-03 19:03:54 +01:00
Samuele E. Locatelli 1ecc12e0a6 Ritocchi compilazione e gitSpread 2020-11-27 17:18:34 +01:00
Samuele E. Locatelli d96853acce fix: tutto in serie 2020-11-27 17:09:27 +01:00
Samuele E. Locatelli 12c8c71540 altro test... 2020-11-27 17:04:04 +01:00
Samuele E. Locatelli 3cf47dd92c modifica x build beta/stable 2020-11-27 17:01:28 +01:00
Samuele E. Locatelli 0a0863c1be Merge branch 'SDK' into beta 2020-11-27 16:50:24 +01:00
Samuele E. Locatelli b355a218cc vered 1339 test in pubblicazione... + reorg jenkinsfile 2020-11-27 16:36:28 +01:00
Samuele E. Locatelli b5ec79c2a1 update conf x test compilazione 2020-11-27 16:29:51 +01:00
Samuele E. Locatelli e252f3d02e aggiunto switch paralle build 4 cpu 2020-11-27 15:58:27 +01:00
Samuele E. Locatelli 94f3ee4092 test build stable/beta 2020-11-27 15:47:55 +01:00
Samuele E. Locatelli 753013b5bb Merge branch 'develop' into ES3 2020-11-27 15:23:26 +01:00
Samuele E. Locatelli 382db0c173 new rel 2020-11-27 15:23:19 +01:00
Samuele E. Locatelli daf27b6cd1 update fix attrezzaggio 2020-11-27 15:23:16 +01:00
Samuele E. Locatelli f0776063c9 eliminata img white sostituita da alpha trasparente 2020-11-26 10:36:05 +01:00
Samuele E. Locatelli 991e962a75 fix override vari su tablet 2020-11-26 10:33:37 +01:00
Samuele E. Locatelli f52fd6f1cd fix config x MON 2020-11-26 10:25:29 +01:00
Samuele E. Locatelli fd7738a193 Merge branch 'develop' into MongoDb 2020-11-26 10:22:31 +01:00
Samuele E. Locatelli 71ac1e537c Update x elmah x MON 2020-11-26 10:22:14 +01:00
Samuele E. Locatelli 1dfde8442b vers 1336 2020-11-26 09:40:23 +01:00
Samuele E. Locatelli e1452bc15b Update grafica x MappaStato TAB 2020-11-26 09:40:12 +01:00
Samuele E. Locatelli 798df4a813 Merge branch 'develop' into MongoDb 2020-11-25 18:56:05 +01:00
Samuele E. Locatelli b9829da9e5 update vers 2020-11-25 18:55:53 +01:00
Samuele E. Locatelli c212bc0cd7 Update x tablet x mostrare avanzamento prod 2020-11-25 18:55:43 +01:00
Samuele E. Locatelli f27aa73ba9 Merge branch 'develop' into ES3 2020-11-25 12:38:03 +01:00
Samuele E. Locatelli 3f43b50651 fix gitSPread 2020-11-25 12:37:52 +01:00
Samuele E. Locatelli 2d93c3cb25 new rel 2020-11-25 12:37:43 +01:00
Samuele E. Locatelli 1d415a2275 update modalità conferma x TAB e IOB-WIN-SIM 2020-11-25 12:37:36 +01:00
Samuele E. Locatelli eacc6860b2 Merge branch 'develop' into beta 2020-11-23 15:06:58 +01:00
Samuele E. Locatelli 4c32261335 new rel 2020-11-23 15:06:48 +01:00
Samuele E. Locatelli ad7f85dafd reshape codice 2020-11-23 15:06:42 +01:00
Samuele E. Locatelli b321400366 Modifica procedure x ricalcolo forceSplitODL x SIM 2020-11-23 15:06:28 +01:00
Samuele E. Locatelli 27a4ca3880 Merge branch 'develop' into ES3 2020-11-20 19:13:11 +01:00
Samuele E. Locatelli 295e65cfd6 new rel 1332 2020-11-20 19:13:03 +01:00
Samuele E. Locatelli 98c9b3785b COmpletato primo relayout 2020-11-20 19:12:07 +01:00
Samuele E. Locatelli a7e670cbbd Fix SITE x titolo e buttons 2020-11-20 19:10:06 +01:00
Samuele E. Locatelli 2dc7117dd6 FIX MP/LAND 2020-11-20 18:29:03 +01:00
Samuele E. Locatelli b3823ac3d8 update steamware libs + dipendenze 2020-11-20 18:25:06 +01:00
Samuele E. Locatelli bcd8bca5f1 OK completamente sistemato! 2020-11-20 16:59:57 +01:00
Samuele E. Locatelli 43539a3bda fix nuget vari - MP/IO --> OK 2020-11-20 16:35:18 +01:00
Samuele E. Locatelli eac27c736c refresh snappy&zip lib 2020-11-20 16:34:48 +01:00
Samuele E. Locatelli 905f51d803 update vers 2020-11-20 16:01:26 +01:00
Samuele E. Locatelli 82594084b9 Merge branch 'develop' into ES3 2020-11-20 16:00:25 +01:00
Samuele E. Locatelli 7b5521ebf4 completato nuget update 2020-11-20 16:00:17 +01:00
Samuele E. Locatelli 5d2a25f45c Code Analisys 2020-11-20 15:46:47 +01:00
Samuele E. Locatelli d27373b915 Update e consolidamento Nuget, ancora... 2020-11-20 15:16:32 +01:00
Samuele E. Locatelli 38d7025239 Ancora altri nuget di refresh 2020-11-20 15:13:36 +01:00
Samuele E. Locatelli a405ddfea8 Update Nuget system >Threading & co 2020-11-20 15:10:30 +01:00
Samuele E. Locatelli 10138b80a0 Ancora update NuGet 2020-11-20 15:05:10 +01:00
Samuele E. Locatelli d2748f6ef7 Ancora NuGet update 2020-11-20 15:02:52 +01:00
Samuele E. Locatelli 47290a9b0a Update nuget vari 2020-11-20 14:59:58 +01:00
Samuele E. Locatelli ed3dedd0b4 typo reorg 2020-11-20 14:10:31 +01:00
Samuele E. Locatelli 43bd8a3dbb Merge branch 'develop' into ES3 2020-11-20 11:35:02 +01:00
Samuele E. Locatelli a9cffdf2bd update vers 1330 2020-11-20 11:34:51 +01:00
Samuele E. Locatelli d7579369e0 fix ordine elementi 2020-11-20 11:34:45 +01:00
Samuele E. Locatelli 2662aeceaa fix mess trad 2020-11-20 11:34:37 +01:00
Samuele E. Locatelli 2d250be96f fix grafico segnaposto conferma 2020-11-20 11:34:27 +01:00
Samuele E. Locatelli 1851af8258 Merge branch 'develop' 2020-11-19 12:54:08 +01:00
Samuele E. Locatelli c1557c73ea new rel 2020-11-19 12:53:32 +01:00
Samuele E. Locatelli 4a4ce83415 refresh 2020-11-19 12:53:28 +01:00
Samuele E. Locatelli f6ffc53170 Fix comportamento Valvital x attrezzaggio con invio parametri PLC in cascata + fix 2020-11-19 12:53:17 +01:00
Samuele E. Locatelli 21d9ae3076 Merge branch 'develop' into ES3 2020-11-18 17:22:27 +01:00
Samuele E. Locatelli 7fb05a3a0a OK fix ODL x selezione DP 2020-11-18 17:22:18 +01:00
Samuele E. Locatelli 9f69227a88 rel 1328 2020-11-18 16:24:34 +01:00
Samuele E. Locatelli 0ad97a8106 Fix IobInfo 2020-11-18 16:24:18 +01:00
Samuele E. Locatelli b5bcce424b vers 1327 2020-11-18 15:12:54 +01:00
Samuele E. Locatelli 97169dbd03 Update x trad prod in SITE con errori, vers 1327 2020-11-18 15:12:46 +01:00
Samuele E. Locatelli 4bffcd2419 fix elmah 2020-11-18 14:51:20 +01:00
Samuele E. Locatelli 26d900f4e9 Merge branch 'develop' into MongoDb 2020-11-18 14:46:32 +01:00
Samuele E. Locatelli 9854fc2f2b 1326 2020-11-18 14:46:13 +01:00
Samuele E. Locatelli ebda7a2282 refresh + vers num 2020-11-18 14:46:01 +01:00
Samuele E. Locatelli f73553a2a2 Update invio dati arti/commessa/pezzi verso PLC da setup ODL 2020-11-18 14:45:55 +01:00
Samuele E. Locatelli d970b704a9 Update gestione segnaposto x conf prod 2020-11-18 10:12:29 +01:00
Samuele E. Locatelli 4b9a4d6b2f commentato gestione segnaposto user input (da rivedere) 2020-11-17 15:45:07 +01:00
Samuele E. Locatelli c106763188 fix 300 ms 2020-11-17 15:18:52 +01:00
Samuele E. Locatelli 36c3c8fbc9 fix per doppio pooallet + ritardo maggiore 2020-11-17 15:10:12 +01:00
Samuele E. Locatelli 93e3a9ca17 Merge branch 'develop' into ES3 2020-11-17 14:21:05 +01:00
Samuele E. Locatelli 12ce7c2edd new rel 2020-11-17 14:20:54 +01:00
Samuele E. Locatelli 23a75eb5b3 Fix messagio user input con delay x TAB 2020-11-17 14:20:24 +01:00
Samuele E. Locatelli c48897e6b0 fix new rel x hide salva con modifica num pz confermati/lasciati 2020-11-16 17:59:12 +01:00
Samuele E. Locatelli 034fce6b98 new rel 2020-11-16 14:48:21 +01:00
Samuele E. Locatelli a31d503865 fix conferma macchine semplici 2020-11-16 14:48:17 +01:00
Samuele E. Locatelli 52933477b7 Abbozzato controller x DbMaint in MON 2020-11-16 14:23:52 +01:00
Samuele E. Locatelli 02a167db23 Merge branch 'develop' into ES3 2020-11-16 11:24:48 +01:00
Samuele E. Locatelli 458ba1be2d new rel 1320 2020-11-16 11:24:39 +01:00
Samuele E. Locatelli f478a8e061 Fix selezione macchina x nuovo ODL ed errori relativi 2020-11-16 11:23:45 +01:00
Samuele E. Locatelli 5c83a5b276 typo + reorg 2020-11-16 09:15:58 +01:00
Samuele E. Locatelli fa2bcb494f Merge branch 'develop' into ES3 2020-11-13 14:21:46 +01:00
Samuele E. Locatelli c9f095ad68 Demo Tab x Baldi (2 review) 2020-11-13 14:21:16 +01:00
Samuele E. Locatelli 04d6e3c145 refresh DS_ProdTempi 2020-11-13 14:21:00 +01:00
Samuele E. Locatelli b905ce8d0a new rel 2020-11-13 14:20:19 +01:00
Samuele E. Locatelli 1a999e3340 Merge branch 'develop' into ES3 2020-11-12 11:38:53 +01:00
Samuele E. Locatelli 9c45d61465 new rel 1318 2020-11-12 11:38:44 +01:00
Samuele E. Locatelli 678ca03e96 Review x permettere conf recupero TC da ODL/PDOL 2020-11-12 11:38:26 +01:00
Samuele E. Locatelli 0691218e73 gestione parametro opzionale ricerca TC x machcina o meno 2020-11-12 11:15:55 +01:00
Samuele E. Locatelli d81c477624 refresh vari 2020-11-09 19:30:41 +01:00
Samuele E. Locatelli 6ebed99670 completamento metodi DS nuovo x Arca IS 2020-11-09 19:30:27 +01:00
Samuele E. Locatelli a1901b7134 Aggiunta reset 2020-11-09 19:30:03 +01:00
Samuele E. Locatelli 2a4fdf6138 Update x gestione pagina SchedaTech 2020-11-09 15:58:02 +01:00
Samuele E. Locatelli f34c3929d5 Avanzamento x scheda tecnica 2020-11-06 17:08:53 +01:00
Samuele E. Locatelli bba6907907 start new rel 2020-11-06 17:08:37 +01:00
Samuele E. Locatelli 9a221c5fcd Merge branch 'develop' into ES3 2020-10-19 11:48:07 +02:00
Samuele E. Locatelli 32bdb57b42 vers 1315 2020-10-19 11:47:52 +02:00
Samuele E. Locatelli 7157cdb3ed cambio: install se beta su IIS01... 2020-10-19 11:47:24 +02:00
Samuele E. Locatelli ba297f40e8 FIx display MON 2020-10-19 11:42:41 +02:00
Samuele E. Locatelli 4bf1d3361e cleanup metodi nascosti da base class 2020-10-19 11:12:48 +02:00
Samuele E. Locatelli dff61a9574 update vers numb 2020-10-19 11:04:37 +02:00
Samuele E. Locatelli aac2695ae6 update conf css + display screen data 2020-10-19 11:04:26 +02:00
Samuele E. Locatelli 9bae157475 tolto commento... 2020-10-17 16:59:21 +02:00
Samuele E. Locatelli 139e66a03a Aggiunto fix master/slave post SPLIT ODL 2020-10-17 16:30:34 +02:00
Samuele E. Locatelli 90b1fd2509 Merge branch 'Giancarlo' into ES3 2020-10-17 16:26:22 +02:00
Samuele E. Locatelli b8387940b4 update x gestione corretta splitODL (1 solo metodo) 2020-10-17 16:25:33 +02:00
Samuele E. Locatelli c4d95e68e1 Update x nuova gestione split con conferma... 2020-10-17 10:58:56 +02:00
Samuele E. Locatelli 3dab58cb3f fix disabilitato editing x ODL su amcchine slave 2020-10-17 09:51:03 +02:00
Samuele E. Locatelli 713db2661b refresh vers numb 2020-10-15 19:47:19 +02:00
Samuele E. Locatelli c848b6177e Update packages NuGet vari x MpAdm 2020-10-15 19:46:28 +02:00
Samuele E. Locatelli 42944c3c1a Refresh dipendenze elmah x MP-LAND 2020-10-15 19:43:31 +02:00
Samuele E. Locatelli d5a2eade8a modifica metodi split ODL con conferma (SIM) 2020-10-15 19:37:06 +02:00
Samuele E. Locatelli 47a2eaecfe Gestione eventi update ODL con ricalcolo SLAVE 2020-10-15 19:09:38 +02:00
Samuele E. Locatelli ab32fc7a02 fix eccezione in selezione subMachine 2020-10-15 19:03:30 +02:00
Samuele E. Locatelli 6380e7409c update gestione ODL 2020-10-15 18:56:47 +02:00
Samuele E. Locatelli ef3a8aac29 update css sito 2020-10-13 11:17:32 +02:00
Samuele E. Locatelli e68a41f662 update log elmah... 2020-10-12 14:14:30 +02:00
Samuele E. Locatelli 5384062163 cambio conf x git spread 2020-10-12 12:44:57 +02:00
2024 changed files with 412499 additions and 240235 deletions
+3
View File
@@ -242,6 +242,8 @@ publish/
# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
/packages/*
*/packages/*
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
@@ -423,3 +425,4 @@ _UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
.ionide/symbolCache.db
+555
View File
@@ -0,0 +1,555 @@
variables:
NUGET_PATH: 'C:\Tools\nuget.exe'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe'
ASPNET_MERGE_PATH: 'C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools'
EXE_RELEASE_FOLDER: 'c:\Projetcs\Compiled\MoonPro\Release'
DEPLOY_FOLDER: 'c:\Projects\Deploy\MoonPro\Builds'
VERS_MAIN: '6.14'
NEW_REL: ''
NEW_DEB: ''
NEXUS_PATH: 'MP-XXXX'
APP_NAME: 'MP.Xxxx'
APP_CONF: 'Release'
SOL_NAME: 'MAPO'
# helper x fix pacchetti nuget da repo locale nexus.steamware.net
.nuget-fix: &nuget-fix
- |
echo "esecuzione Nuget FIX steps"
dotnet nuget list source
$hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus Proxy"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source "`"Steamware Nexus Proxy`""
}
$hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source "`"Steamware Nexus`""
}
$hasSource = dotnet nuget list source | Select-String -Pattern "nexus-proxy-v3"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source nexus-proxy-v3
}
dotnet nuget add source https://nexus.steamware.net/repository/nuget-group-3/index.json -n "Steamware Nexus" -u nugetUser -p $NEXUS_PASSWD --store-password-in-clear-text
echo "Steamware Nexus Source added"
# helper creazione hash files x IIS
.hashBuild: &hashBuild
- |
$Target = $env:APP_NAME + "\Release\" + $env:APP_NAME + ".zip"
$MD5 = Get-FileHash $Target -Algorithm MD5
$SHA1 = Get-FileHash $Target -Algorithm SHA1
New-Item $Target".md5"
New-Item $Target".sha1"
$MD5.Hash | Set-Content -Path $Target".md5"
$SHA1.Hash | Set-Content -Path $Target".sha1"
echo "Created HASH files for $Target"
# helper x send su NEXUS x pack
.nexusUpload: &nexusUpload
- |
Set-Alias mCurl C:\Windows\system32\curl.exe
$currentDate = get-date -format yyMM;
$currentTime = get-date -format ddHH;
$VersNumb = $env:NEW_REL
echo "Curr Version: $VersNumb"
$FileManIn="VersGen\manifest.xml"
$FileManOut=$env:APP_NAME +"\Resources\manifest.xml"
$FileCLogIn="VersGen\ChangeLog.html"
$FileCLogOut=$env:APP_NAME +"\Resources\ChangeLog.html"
echo "Manifest path: $FileManOut"
echo "ChangeLog path: $FileCLogOut"
if($CI_COMMIT_BRANCH -eq "master")
{
$version = "stable"
}
else
{
$version = "unstable"
}
$manData = Get-Content $FileManIn
$manData = $manData -replace "1.0.0.0", $VersNumb
$manData = $manData -replace "{{DIRNAME}}", $env:NEXUS_PATH
$manData = $manData -replace "{{BRANCHNAME}}", "$version/LAST"
$manData = $manData -replace "{{PACKNAME}}", $env:APP_NAME
Set-Content -Path $FileManOut -Value $manData
$clogData = Get-Content $FileCLogIn
$clogData = $clogData -replace "{{CURRENT-REL}}", $VersNumb
Set-Content -Path $FileCLogOut -Value $clogData
$File2Send = Get-ChildItem($env:APP_NAME + "\Release\*")
ForEach ($File in $File2Send) {
$FileName = Split-Path $File -leaf
echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName"
mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/$FileName
echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName"
mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $File https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/ARCHIVE/$VersNumb/$FileName
}
echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileManOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml"
mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileManOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
echo "mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html"
mCurl -s -u GitLab:$NEXUS_PASSWD --upload-file $FileCLogOut https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
# helper x fix version number
.version-fix: &version-fix
- |
$env:NEW_REL = $env:VERS_MAIN+"."+(get-date -format yyMM)+"."+(get-date -format dHH)
echo "Set vers: $env:NEW_REL"
$anno = (get-date -format yyyy)
$adesso = (get-date -format dd:HH:mm)
$contenuto = Get-Content -path 'VersGen\MoonPro.cs' -Raw
$newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
$newContenuto | Set-Content -Path 'VersGen\MoonPro.cs'
echo "Modifica dati file nuspec Release"
$currRelease = $env:NEW_REL
$lastDot = $currRelease.LastIndexOf(".");
$currDebug = $currRelease.Substring(0, $lastDot)+"-beta"+$currRelease.Substring($lastDot);
$env:NEW_DEB = $currDebug
$find = "<version>(.|\n)*?</version>";
$fileNameRel = "MapoSDK.Release.nuspec";
$replRel = "<version>" + $currRelease + "</version>";
$replCopy = "Copyright EgalWare, ©2007-" + $anno
$nuspDataRel = Get-Content $fileNameRel;
$nuspDataRelUpd = $nuspDataRel -replace $find, $replRel;
$nuspDataRelUpd = $nuspDataRelUpd -replace "#copyright#", $replCopy;
$nuspDataRelUpd = $nuspDataRelUpd -replace "#releaseNotes#", "Build $adesso";
Set-Content -Path $fileNameRel -Value $nuspDataRelUpd;
echo "Modifica dati file nuspec Debug"
$fileNameDeb = "MapoSDK.Debug.nuspec";
$replDeb = "<version>" + $currDebug + "</version>";
$nuspDataDeb = Get-Content $fileNameDeb;
$nuspDataDebUpd = $nuspDataDeb -replace $find, $replDeb;
$nuspDataDebUpd = $nuspDataDebUpd -replace "#copyright#", $replCopy;
$nuspDataDebUpd = $nuspDataDebUpd -replace "#releaseNotes#", "Build $adesso";
Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd;
echo "replace completati"
stages:
- build
- sdk
- staging
- deploy
- installer
SDK-stable:
stage: sdk
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "SDK"'
variables:
APP_NAME: MapoSDK
NEXUS_PATH: MapoSDK
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Release /verbosity:minimal /m'
- '& Remove-Item *.nupkg'
- '& $env:NUGET_PATH pack "$env:APP_NAME.Release.nuspec"'
- '& $env:NUGET_PATH setapikey $NUGET_API_KEY -source https://nexus.steamware.net/repository/nuget-hosted'
- '& $env:NUGET_PATH push "$env:APP_NAME.$env:NEW_REL.nupkg" -Source https://nexus.steamware.net/repository/nuget-hosted'
SDK-unstable:
stage: sdk
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MapoSDK
NEXUS_PATH: MapoSDK
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" "$env:APP_NAME\$env:APP_NAME.csproj" -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/Debug /verbosity:minimal /m'
- '& Remove-Item *.nupkg'
- '& $env:NUGET_PATH pack "$env:APP_NAME.Debug.nuspec"'
- '& $env:NUGET_PATH setapikey $NUGET_API_KEY -source https://nexus.steamware.net/repository/nuget-hosted'
- '& $env:NUGET_PATH push "$env:APP_NAME.$env:NEW_DEB.nupkg" -Source https://nexus.steamware.net/repository/nuget-hosted'
ADM:build:
stage: build
variables:
CURR_PRJ: "MP-ADM"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
IO:build:
stage: build
variables:
CURR_PRJ: "MP-IO"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
SITE:build:
stage: build
variables:
CURR_PRJ: "MP-SITE"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
# MON:build:
# stage: build
# variables:
# CURR_PRJ: "MP-MON"
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH != "SDK"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
TAB:build:
stage: build
variables:
CURR_PRJ: "MP-TAB"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
MAG:build:
stage: build
variables:
CURR_PRJ: "MP-MAG"
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH != "SDK"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" MP-MAG/MP-MAG.csproj -target:Build /p:Configuration=Release /p:Platform="Any CPU" /p:OutputPath=bin/ /verbosity:minimal /m'
ADM:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
needs: ["ADM:build"]
IO:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
needs: ["IO:build"]
SITE:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
# MON:staging:
# stage: staging
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "develop"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
# needs: ["MON:build"]
TAB:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
needs: ["TAB:build"]
MAG:staging:
stage: staging
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "develop"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Debug /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
needs: ["MAG:build"]
ADM:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-ADM/MP-ADM.csproj'
needs: ["ADM:build"]
IO:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-IO/MP-IO.csproj'
needs: ["IO:build"]
SITE:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-SITE/MP-SITE.csproj'
needs: ["SITE:build"]
# MON:deploy:
# stage: deploy
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "master"'
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MON/MP-MON.csproj'
# needs: ["MON:build"]
TAB:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-TAB/MP-TAB.csproj'
needs: ["TAB:build"]
MAG:deploy:
stage: deploy
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=$IIS_PWD /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ /verbosity:minimal MP-MAG/MP-MAG.csproj'
needs: ["MAG:build"]
ADM:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-ADM
NEXUS_PATH: MP-ADM
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/ADM" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["ADM:build"]
IO:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-IO
NEXUS_PATH: MP-IO
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/IO" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["IO:build"]
SITE:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-SITE
NEXUS_PATH: MP-SITE
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/SITE" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["SITE:build"]
# MON:install:
# stage: installer
# tags:
# - win
# rules:
# - if: '$CI_COMMIT_BRANCH == "master"'
# when: manual
# - if: '$CI_COMMIT_BRANCH == "develop"'
# variables:
# APP_NAME: MP-MON
# NEXUS_PATH: MP-MON
# before_script:
# - *nuget-fix
# - '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
# - *version-fix
# script:
# - '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MON" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
# - *hashBuild
# - *nexusUpload
# needs: ["MON:build"]
TAB:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-TAB
NEXUS_PATH: MP-TAB
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/TAB" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["TAB:build"]
MAG:install:
stage: installer
tags:
- win
rules:
- if: '$CI_COMMIT_BRANCH == "master"'
when: manual
- if: '$CI_COMMIT_BRANCH == "develop"'
variables:
APP_NAME: MP-MAG
NEXUS_PATH: MP-MAG
before_script:
- *nuget-fix
- '& "$env:NUGET_PATH" restore "$env:SOL_NAME.sln" -verbosity quiet'
- *version-fix
script:
- '& "$env:MSBUILD_PATH" /p:m=4 /p:AspnetMergePath=$env:ASPNET_MERGE_PATH /T:Package /P:Configuration=Release /p:PublishProfile=IIS03.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=Release/$env:APP_NAME.zip /p:DeployIisAppPath="Default Web Site/MP/MAG" /p:PackageAsSingleFile=True /p:OutputPath=bin/ /verbosity:minimal $env:APP_NAME/$env:APP_NAME.csproj'
- *hashBuild
- *nexusUpload
needs: ["MAG:build"]
+2 -2
View File
@@ -30,7 +30,7 @@
<UseGlobalApplicationHostFile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TypeScriptToolsVersion>3.7</TypeScriptToolsVersion>
<TypeScriptToolsVersion>Latest</TypeScriptToolsVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -141,7 +141,7 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
+1 -1
View File
@@ -17,7 +17,7 @@
<!--Redis conn-->
<add key="RedisConn" value="localhost,abortConnect=false,ssl=false" />
<add key="RedisConnAdmin" value="localhost,abortConnect=false,ssl=false" />
<add key="redisDb" value="1" />
<add key="redisDb" value="5" />
<!--altri parametri-->
<add key="CodModulo" value="MoonPro" />
<add key="cacheOnRedis" value="true" />
Vendored
-362
View File
@@ -1,362 +0,0 @@
pipeline {
// Declarative Pipeline MODE con Scripted Pipeline Syntax entro le chiamate script { }
agent none
environment {
EMAIL_RECIPIENTS = 'samuele@steamware.net'
enableIIS01 = 'Y'
enableIIS02 = 'Y'
}
stages {
stage('Checkout') {
agent any
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1307']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.11.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
}
script {
currentBuild.displayName = "${env.versionNumber}"
if (env.BRANCH_NAME == "develop" || env.BRANCH_NAME.contains("DEMO")) {
currentBuild.description = "TEST ${env.versionNumber}"
}
else {
currentBuild.description = "BUILD ${env.versionNumber}"
}
}
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
// checkout NuGet in file sorgente!!!
fixNuget("${WORKSPACE}\\MAPO.sln")
// bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln"
}
}
stage('Build') {
agent any
steps {
script {
properties([buildDiscarder(logRotator(artifactDaysToKeepStr: '180', artifactNumToKeepStr: '30', daysToKeepStr: '360', numToKeepStr: '30')), pipelineTriggers([])])
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
// checkout NuGet in file sorgente!!!
fixNuget("${WORKSPACE}\\MAPO.sln")
// bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln"
}
script {
/* compilo installers in base al BRANCH del cliente... */
if (env.BRANCH_NAME == "develop") {
parallel (
ADM_IO_MON: {
bat "\"${tool 'MSBuild-15.0'}\" MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
bat "\"${tool 'MSBuild-15.0'}\" MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
bat "\"${tool 'MSBuild-15.0'}\" MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
LAND_SITE_TAB: {
sleep 4
bat "\"${tool 'MSBuild-15.0'}\" MP-LAND/MP-LAND.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
bat "\"${tool 'MSBuild-15.0'}\" MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
bat "\"${tool 'MSBuild-15.0'}\" MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /m"
},
failFast: false)
}
else {
echo 'Niente x Build (limitata a develop)...'
}
}
}
}
stage('Deploy') {
agent any
steps {
script {
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
// checkout NuGet in file sorgente!!!
fixNuget("${WORKSPACE}\\MAPO.sln")
// bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln"
}
script {
/* DEPLOY condizionale: master (Ufficio Seriate) / demo_ovh (Demo Online) */
if (env.BRANCH_NAME == "master") {
parallel (
ADM_IO: {
sleep 2
if(env.enableIIS01 == "Y")
{
// ADM
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj"
// IO
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj"
}
if(env.enableIIS02 == "Y")
{
// ADM
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj"
// IO
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-IO/MP-IO.csproj"
}
},
LAND_MON: {
sleep 4
if(env.enableIIS02 == "Y")
{
//LAND
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-LAND/MP-LAND.csproj"
// MON
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-MON/MP-MON.csproj"
}
if(env.enableIIS01 == "Y")
{
// LAND
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=Release /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-LAND/MP-LAND.csproj"
// MON
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-MON/MP-MON.csproj"
}
},
SITE_TAB: {
sleep 0
if(env.enableIIS01 == "Y")
{
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj"
// TAB
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS01.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS01 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj"
}
if(env.enableIIS02 == "Y")
{
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj"
// TAB
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /p:DeployOnBuild=true /p:Targets=Publish /p:PublishProfile=IIS02.pubxml /p:RunCodeAnalysis=false /p:Configuration=IIS02 /p:username=jenkins /p:Password=viadante16 /p:AllowUntrustedCertificate=true /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj"
}
},
failFast: false)
}
else if (env.BRANCH_NAME == "SDK") {
env.config = "Release"
env.packVers = env.versionNumber
// elimino vecchie build...
bat "del /f /q *.nupkg"
// BUILD!
bat "\"${tool 'MSBuild-16.0'}\" MapoSDK\\MapoSDK.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /m"
// creo package NuGet... con version in modo da fare ANCHE le beta
bat "e:\\nuget.exe pack ${WORKSPACE}\\MapoSDK\\MapoSDK.csproj -properties Configuration=${env.config} -Version ${env.packVers}"
// lancio upload con nuget!
echo 'Start upload with nuget push'
bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-hosted"
bat "e:\\nuget.exe push MapoSDK.${env.packVers}.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted"
}
else {
echo 'Nothing to deploy...'
}
}
}
}
stage('Installers') {
// da rivedere: creare branch = versioni LEGACY, STABLE (LTS), INSIDER (ULTIMATE), e NON pubblicare DOCS (ex branch Giancarlo)... impostare filtro?
agent any
steps {
// in primis cambio versione e NuGet
script {
// CAMBIO numero versione + checkout NuGet in file sorgente!!!
bat "fart.exe VersGen\\MoonPro.cs 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
// checkout NuGet in file sorgente!!!
fixNuget("${WORKSPACE}\\MAPO.sln")
// bat "e:\\nuget.exe restore ${WORKSPACE}\\MAPO.sln"
}
// ora mi occupo delle operazioni di compressione e copia...
script {
/* compilo installers SOLO stable / beta */
if (env.BRANCH_NAME == "stable" || env.BRANCH_NAME.contains("beta") ) {
parallel (
ADM_IO: {
sleep 2
// ADM
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/ADM.zip /p:DeployIisAppPath=\"Default Web Site/MP/ADM\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-ADM/MP-ADM.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-ADM\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "ADM")
// IO
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/IO.zip /p:DeployIisAppPath=\"Default Web Site/MP/IO\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-IO/MP-IO.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-IO\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "IO")
},
LAND_MON: {
sleep 4
// LAND
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/LAND.zip /p:DeployIisAppPath=\"Default Web Site/MP/LAND\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-LAND/MP-LAND.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-LAND\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "LAND")
// MON
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/MON.zip /p:DeployIisAppPath=\"Default Web Site/MP/MON\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-MON/MP-MON.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-MON\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "MON")
},
SITE_TAB: {
sleep 0
// SITE
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/SITE.zip /p:DeployIisAppPath=\"Default Web Site/MP/SITE\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-SITE/MP-SITE.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-SITE\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "SITE")
// TAB
sleep 2
bat "\"${tool 'MSBuild-15.0'}\" \"/p:AspnetMergePath=C:\\Program Files (x86)\\Microsoft SDKs\\Windows\\v10.0A\\bin\\NETFX 4.6.2 Tools\" /T:Package /P:Configuration=Prod /p:PublishProfile=${env.BRANCH_NAME}.pubxml /p:RunCodeAnalysis=false /p:PackageLocation=ReleaseClienti/${env.BRANCH_NAME}/TAB.zip /p:DeployIisAppPath=\"Default Web Site/MP/TAB\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-TAB/MP-TAB.csproj"
// pubblico su server deploy!
publishToDeployServer("MP-TAB\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "TAB")
},
failFast: false)
}
else
{
echo 'Questo BRANCH non necessita di installer...'
}
}
script {
// calcolo il config...
if (env.BRANCH_NAME.contains("beta")) {
env.config = "Debug"
env.classifier = "unstable"
}
else if (env.BRANCH_NAME == "stable") {
env.config = "Release"
env.classifier = ""
}
if (env.BRANCH_NAME == "stable" || env.BRANCH_NAME.contains("beta") ) {
nexusArtifactUploader (
artifacts: [
[
artifactId: 'MP-ADM',
classifier: "${env.classifier}",
file: "MP-ADM\\ReleaseClienti\\${env.BRANCH_NAME}\\ADM.zip",
type: 'zip'
],
[
artifactId: 'MP-IO',
classifier: "${env.classifier}",
file: "MP-IO\\ReleaseClienti\\${env.BRANCH_NAME}\\IO.zip",
type: 'zip'
],
[
artifactId: 'MP-LAND',
classifier: "${env.classifier}",
file: "MP-LAND\\ReleaseClienti\\${env.BRANCH_NAME}\\LAND.zip",
type: 'zip'
],
[
artifactId: 'MP-MON',
classifier: "${env.classifier}",
file: "MP-MON\\ReleaseClienti\\${env.BRANCH_NAME}\\MON.zip",
type: 'zip'
],
[
artifactId: 'MP-SITE',
classifier: "${env.classifier}",
file: "MP-SITE\\ReleaseClienti\\${env.BRANCH_NAME}\\SITE.zip",
type: 'zip'
],
[
artifactId: 'MP-TAB',
classifier: "${env.classifier}",
file: "MP-TAB\\ReleaseClienti\\${env.BRANCH_NAME}\\TAB.zip",
type: 'zip'
]
],
credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5',
//groupId: 'MP',
nexusUrl: 'nexus.steamware.net',
nexusVersion: 'nexus3',
protocol: 'http',
repository: 'SWS',
version: "${env.versionNumber}"
)
}
}
}
}
}
post {
success {
sendSlack("Successful", "good")
}
failure {
sendSlack("Failed", "danger")
}
unstable {
sendSlack("Unstable", "warning")
}
}
}
// Funzione x pubblicazione su server IIS di deploy
def publishToDeployServer(prjPath, iisPath, packName) {
echo "Richiesto esecuzione publishToDeployServer con parametri: " + prjPath + " | " + iisPath + " | " + packName
// inizio copiando files di base da area VersGen...
bat "xcopy /y VersGen\\ChangeLog.html " + prjPath + "Resources\\ChangeLog.html "
bat "xcopy /y VersGen\\logoSteamware.png " + prjPath + "Resources\\logoSteamware.png "
bat "xcopy /y VersGen\\manifest.xml " + prjPath + "Resources\\manifest.xml "
// manifest.xml: aggiorno versNumber ed URL del branch di update...
bat "fart.exe " + prjPath + "Resources\\manifest.xml 1.0.0.0 ${env.versionNumber} || EXIT /B 0"
bat "fart.exe " + prjPath + "Resources\\manifest.xml {{BRANCHNAME}} ${env.BRANCH_NAME} || EXIT /B 0"
bat "fart.exe " + prjPath + "Resources\\manifest.xml {{PACKNAME}} " + packName + " || EXIT /B 0"
bat "fart.exe " + prjPath + "Resources\\ChangeLog.html {{CURRENT-REL}} ${env.versionNumber} || EXIT /B 0"
writeFile file: prjPath + 'changeLog.log', text: "${getChangeString()}"
powershell '(Get-Content ' + prjPath + 'Resources\\ChangeLog.html) | ForEach-Object { $_ -replace \"{{LAST-CHANGES}}\", \"${getChangeString()}\" } | Set-Content ' + prjPath + 'Resources\\ChangeLog.html'
// copio ed esporto in IIS02 i vari files .xml, .html, .zip
bat "xcopy /y " + prjPath + "Resources\\manifest.xml " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
bat "xcopy /y " + prjPath + "Resources\\ChangeLog.html " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
bat "xcopy /y " + prjPath + "Resources\\logoSteamware.png " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
// copio x AutoUpdate deploy
bat "xcopy /y " + prjPath + "\\ReleaseClienti\\${env.BRANCH_NAME}\\" + packName + ".zip " + iisPath + packName + "\\${env.BRANCH_NAME}\\ "
}
@NonCPS
// Funzione x recupero changeLog
def getChangeString() {
MAX_MSG_LEN = 100
def changeString = ""
echo "Gathering SCM changes"
def changeLogSets = currentBuild.changeSets
for (int i = 0; i < changeLogSets.size(); i++) {
def entries = changeLogSets[i].items
for (int j = 0; j < entries.length; j++) {
def entry = entries[j]
truncated_msg = entry.msg.take(MAX_MSG_LEN)
changeString += " - ${truncated_msg} [${entry.author}]\n"
}
}
if (!changeString) {
changeString = " - Nessuna Modifica"
}
return changeString
}
// Funzione x invio slack
def sendSlack(status, colorCode) {
slackSend (
color: colorCode,
channel: "#mapo-dev",
failOnError: false,
message: "${env.JOB_NAME} ${env.versionNumber} | " + status + ": Build ${env.BUILD_NUMBER}\n\n" +
"Modifiche:\n " + getChangeString() + "\n\n Verifica build: <${env.BUILD_URL}|Apri>" + "\n"
)
}
// funzione x fix pacchetti nuget da NOSTRO repo Nexus con proxy
def fixNuget(solutionFile) {
// bat "e:\\nuget setapikey fe387daa-d07c-3207-877e-96c8be1be91b -source http://nexus.steamware.net/repository/nuget-group"
// solo la prima volta va aggiunta...
hasSource = bat "e:\\nuget sources list | find \"Steamware\" /C"
if (hasSource == "0")
{
bat "e:\\nuget sources Add -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
}
else
{
bat "e:\\nuget sources Update -Name \"Steamware Nexus\" -Source http://nexus.steamware.net/repository/nuget-group -username \"nugetUser\" -password \"viaDante16\""
}
bat "e:\\nuget.exe restore ${solutionFile}"
}
+21 -119
View File
@@ -1,18 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29424.173
# Visual Studio Version 17
VisualStudioVersion = 17.0.32126.317
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{663F7136-F470-4911-A9B6-044447F93168}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoDb", "MapoDb\MapoDb.csproj", "{4617A665-D6E3-4CEB-A689-CE2EECD45713}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-LAND", "MP-LAND\MP-LAND.csproj", "{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-IO", "MP-IO\MP-IO.csproj", "{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MON", "MP-MON\MP-MON.csproj", "{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-TAB", "MP-TAB\MP-TAB.csproj", "{51F720FE-7BED-4275-93B1-CDA9A9B53670}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8688B7C8-87E9-4FCE-B607-9C3F963CD6B7}"
@@ -27,162 +23,68 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-SITE", "MP-SITE\MP-SITE.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapoSDK", "MapoSDK\MapoSDK.csproj", "{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MagData", "MagData\MagData.csproj", "{973245E4-02C0-4ED1-A81B-1727C5F4CA59}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP-MAG", "MP-MAG\MP-MAG.csproj", "{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Donati|Any CPU = Donati|Any CPU
IIS01|Any CPU = IIS01|Any CPU
IIS02|Any CPU = IIS02|Any CPU
Jetco|Any CPU = Jetco|Any CPU
OVH-Demo|Any CPU = OVH-Demo|Any CPU
Prod|Any CPU = Prod|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Debug|Any CPU.Build.0 = Debug|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Donati|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Prod|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Release|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Donati|Any CPU.ActiveCfg = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Donati|Any CPU.Build.0 = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Prod|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Release|Any CPU.Build.0 = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Donati|Any CPU.Build.0 = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Jetco|Any CPU.Build.0 = Jetco|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Prod|Any CPU.Build.0 = Prod|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{119EF0B4-CCE1-4F08-9ED2-D54E7775B4D9}.Release|Any CPU.Build.0 = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Donati|Any CPU.Build.0 = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Jetco|Any CPU.Build.0 = Jetco|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.Build.0 = Prod|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CE6CADA3-FA0E-41D6-AD43-8C92481DC29E}.Release|Any CPU.Build.0 = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Donati|Any CPU.Build.0 = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Jetco|Any CPU.Build.0 = Jetco|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.ActiveCfg = OVH-demo|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.OVH-Demo|Any CPU.Build.0 = OVH-demo|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Prod|Any CPU.Build.0 = Prod|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA8BCBB8-601C-4642-AE65-0EBF9D5FBE15}.Release|Any CPU.Build.0 = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Debug|Any CPU.Build.0 = Debug|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Donati|Any CPU.Build.0 = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Jetco|Any CPU.ActiveCfg = Jetco|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Jetco|Any CPU.Build.0 = Jetco|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.ActiveCfg = OVH-Demo|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.OVH-Demo|Any CPU.Build.0 = OVH-Demo|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.Build.0 = Prod|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.ActiveCfg = Release|Any CPU
{51F720FE-7BED-4275-93B1-CDA9A9B53670}.Release|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Donati|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Jetco|Any CPU.Build.0 = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.ActiveCfg = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.OVH-Demo|Any CPU.Build.0 = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.ActiveCfg = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.Build.0 = Prod|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5A49351-F487-4329-8117-925A8FE662E5}.Release|Any CPU.Build.0 = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Donati|Any CPU.ActiveCfg = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Donati|Any CPU.Build.0 = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.IIS01|Any CPU.ActiveCfg = IIS01|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.IIS01|Any CPU.Build.0 = IIS01|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.IIS02|Any CPU.ActiveCfg = IIS02|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.IIS02|Any CPU.Build.0 = IIS02|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Jetco|Any CPU.Build.0 = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Prod|Any CPU.Build.0 = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F2856BFC-7B4E-401E-932E-415DA8ECAAD6}.Release|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Donati|Any CPU.ActiveCfg = Debug|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Donati|Any CPU.Build.0 = Debug|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS01|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS02|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Jetco|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.OVH-Demo|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Prod|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Prod|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Release|Any CPU.Build.0 = Release|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Prod|Any CPU.ActiveCfg = Debug|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Prod|Any CPU.Build.0 = Debug|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{973245E4-02C0-4ED1-A81B-1727C5F4CA59}.Release|Any CPU.Build.0 = Release|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Prod|Any CPU.ActiveCfg = Debug|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Prod|Any CPU.Build.0 = Debug|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECFD70CB-FE89-418C-82ED-6D0ACFDE6C07}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+11 -11
View File
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14
# Visual Studio Version 17
VisualStudioVersion = 17.9.34714.143
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{663F7136-F470-4911-A9B6-044447F93168}"
EndProject
@@ -22,7 +22,7 @@ Global
Debug|Any CPU = Debug|Any CPU
Donati|Any CPU = Donati|Any CPU
IIS01|Any CPU = IIS01|Any CPU
IIS02|Any CPU = IIS02|Any CPU
IIS03|Any CPU = IIS03|Any CPU
Jetco|Any CPU = Jetco|Any CPU
OVH-Demo|Any CPU = OVH-Demo|Any CPU
Prod|Any CPU = Prod|Any CPU
@@ -35,8 +35,8 @@ Global
{663F7136-F470-4911-A9B6-044447F93168}.Donati|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS01|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS02|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS03|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.IIS03|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.Jetco|Any CPU.Build.0 = Release|Any CPU
{663F7136-F470-4911-A9B6-044447F93168}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
@@ -51,8 +51,8 @@ Global
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Donati|Any CPU.Build.0 = Debug|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS01|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS02|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS03|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.IIS03|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.Jetco|Any CPU.Build.0 = Release|Any CPU
{4617A665-D6E3-4CEB-A689-CE2EECD45713}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,8 +67,8 @@ Global
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Donati|Any CPU.Build.0 = Debug|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS01|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS02|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS03|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.IIS03|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.Jetco|Any CPU.Build.0 = Release|Any CPU
{D07211B6-CF67-4C7F-8040-5B8C3B12BB4B}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
@@ -83,8 +83,8 @@ Global
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Donati|Any CPU.Build.0 = Debug|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS01|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS02|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS03|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.IIS03|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.ActiveCfg = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.Jetco|Any CPU.Build.0 = Release|Any CPU
{C5296C93-4738-4B42-8C9D-B7E5A75110FD}.OVH-Demo|Any CPU.ActiveCfg = Release|Any CPU
+28
View File
@@ -0,0 +1,28 @@
[*.cs]
indent_style = space
indent_size = 4
#tab_width = 2
trim_trailing_whitespace = true
# Default severity for analyzer diagnostics with category 'Design'
dotnet_analyzer_diagnostic.category-Design.severity = none
# Default severity for analyzer diagnostics with category 'Redundancy'
dotnet_analyzer_diagnostic.category-Redundancy.severity = none
# Default severity for analyzer diagnostics with category 'Naming'
dotnet_analyzer_diagnostic.category-Naming.severity = none
# Default severity for analyzer diagnostics with category 'Globalization'
dotnet_analyzer_diagnostic.category-Globalization.severity = none
# CA1805: Non eseguire inutilmente l'inizializzazione
dotnet_diagnostic.CA1805.severity = none
# CA2227: Le proprietà delle raccolte devono essere di sola lettura
dotnet_diagnostic.CA2227.severity = none
# CA1825: Evitare allocazioni di matrice di lunghezza zero.
dotnet_diagnostic.CA1825.severity = none
# CA5372: Usa XmlReader per XPathDocument
dotnet_diagnostic.CA5372.severity = none
# RCS1155: Use StringComparison when comparing strings.
dotnet_diagnostic.RCS1155.severity = none
+1 -1
View File
@@ -1,5 +1,5 @@
---------------------------------------------------------------
------- SteamWareLib SDK -------
------- SteamWare SDK -------
---------------------------------------------------------------
Libreria di utility base di SteamWare.
@@ -19,13 +19,13 @@
<targets async="true">
<target xsi:type="File"
name="SteamWareLib"
name="SteamWare"
fileName="${basedir}/logs/${shortdate}-SteamWare.log"
layout="${longdate} ${uppercase:${level}} ${message}"
/>
</targets>
<rules>
<logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWareLib" />
<logger name="SteamWare.*" minlevel="Debug" writeTo="SteamWare" />
</rules>
</nlog>
@@ -2,8 +2,10 @@
_adminEmail samuele@steamware.net,info@steamware.net samuele@steamware.net,info@steamware.net info@steamware.net
_allowForceUser true true abilita login forzato
_commonPages menu menu pagina comune
_emailPwd drmfsls16 drmfsls16 drmfsls16
_emailUser steamwarebot@gmail.com steamwarebot@gmail.com steamwarebot@gmail.com
_emailPwd siamoInViaNazionale93 siamoInViaNazionale93 siamoInViaNazionale93
_emailUser steamwarebot@outlook.it steamwarebot@outlook.it steamwarebot@outlook.it
_smtpCli smtp-mail.outlook.com smtp-mail.outlook.com smtp-mail.outlook.com
_fromEmail steamwarebot@outlook.it steamwarebot@outlook.it steamwarebot@outlook.it
_enableSSL true true true
_fromEmail webmaster@admodelling.org webmaster@admodelling.org email mittente eventuali msg
_righeDataGrid 30 30 Num righe datagrid std
+7
View File
@@ -0,0 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Azienda.aspx.cs" Inherits="MP_ADM.Azienda" %>
<%@ Register Src="~/WebUserControls/cmp_CompanySelector.ascx" TagPrefix="uc1" TagName="cmp_CompanySelector" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:cmp_CompanySelector runat="server" id="cmp_CompanySelector" />
</asp:Content>
+24
View File
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM
{
public partial class Azienda : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM
{
public partial class Azienda
{
/// <summary>
/// cmp_CompanySelector control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.cmp_CompanySelector cmp_CompanySelector;
}
}
+21 -12
View File
@@ -5,18 +5,7 @@ namespace MP_ADM
{
public partial class BCode : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
}
}
#region Private Methods
private void checkEnabled()
{
@@ -29,5 +18,25 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
((MoonPro)this.Master).showSearch = true;
}
}
#endregion Protected Methods
}
}
+17 -4
View File
@@ -1,10 +1,22 @@
using MapoDb;
using SteamWare;
using System;
namespace MP_ADM
{
public class BasePage : System.Web.UI.Page
{
#region Internal Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Internal Fields
#region Protected Properties
/// <summary>
/// Prox pagina da aprire
/// </summary>
@@ -21,10 +33,9 @@ namespace MP_ADM
}
}
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Protected Properties
#region Public Methods
/// <summary>
/// effettua traduzione del lemma
@@ -45,5 +56,7 @@ namespace MP_ADM
{
return user_std.UtSn.TraduciEn(lemma);
}
#endregion Public Methods
}
}
+237 -77
View File
@@ -6,7 +6,65 @@ namespace MP_ADM
{
public class BaseUserControl : System.Web.UI.UserControl
{
#region gestione eventi
#region Internal Fields
/// <summary>
/// Oggetto datalayer specifico NON singleton x scalare
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
#endregion Internal Fields
#region Public Fields
/// <summary>
/// Abilitazione gestione Controlli periodici
/// </summary>
public bool enableControlli = memLayer.ML.cdvb("enableControlli");
/// <summary>
/// Abilitazione gestione Disegno articolo
/// </summary>
public bool enableDisegno = memLayer.ML.cdvb("enableDisegno");
/// <summary>
/// Abilitazione gestione grafici JScript
/// </summary>
public bool enableGraphJS = memLayer.ML.cdvb("enableGraphJS");
/// <summary>
/// Abilitazione gestione Pezzi LAsciati in macchina
/// </summary>
public bool enablePzProdLasciati = memLayer.ML.cdvb("enablePzProdLasciati");
/// <summary>
/// Abilitazione gestione Richieste - Promesse - ODL
/// </summary>
public bool enableRPO = memLayer.ML.cdvb("enableRPO");
/// <summary>
/// Abilitazione gestione scarti
/// </summary>
public bool enableScarti = memLayer.ML.cdvb("enableScarti");
/// <summary>
/// Abilitazione scheda Tecnica
/// </summary>
public bool enableSchedaTecnica = memLayer.ML.cdvb("enableSchedaTecnica");
/// <summary>
/// Abilitazione gestione SplitODL
/// </summary>
public bool enableSplitODL = memLayer.ML.cdvb("enableSplitODL");
/// <summary>
/// Abilitazione gestione Set PZ Pallet su tablet
/// </summary>
public bool enableTabSetPzPallet = memLayer.ML.cdvb("enableTabSetPzPallet");
#endregion Public Fields
#region Public Events
public event EventHandler eh_nuovoValore;
@@ -14,53 +72,22 @@ namespace MP_ADM
public event EventHandler eh_selValore;
/// <summary>
/// Solleva evento nuovo valore
/// </summary>
public void raiseNewVal()
{
// evento come nuovo...
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
}
#endregion Public Events
public void raiseSelNew()
{
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
#region Public Properties
/// <summary>
/// Solleva evento reset
/// Clipboard corrente utente
/// </summary>
public void raiseReset()
{
if (eh_resetSelezione != null)
{
eh_resetSelezione(this, new EventArgs());
}
}
#endregion gestione eventi
/// <summary>
/// Oggetto datalayer specifico NON singleton x scalare
/// </summary>
internal DataLayer DataLayerObj = new DataLayer();
/// <summary>
/// UID formattato con "_"
/// </summary>
public string uid
public string clipboard
{
get
{
return this.UniqueID.Replace("$", "_").Replace("-", "_");
return memLayer.ML.StringSessionObj("UserClipboard");
}
set
{
memLayer.ML.setSessionVal("UserClipboard", value);
}
}
@@ -75,7 +102,174 @@ namespace MP_ADM
}
}
#region utils
/// <summary>
/// UID formattato con "_"
/// </summary>
public string uid
{
get
{
return this.UniqueID.Replace("$", "_").Replace("-", "_");
}
}
#endregion Public Properties
#region Protected Methods
/// <summary>
/// Verifica se la macchina MAIN sia MASTER
/// </summary>
protected bool isMaster(string idxMacchina)
{
return DataLayerObj.isMaster(idxMacchina);
}
/// <summary>
/// Verifica se la macchina MAIN sia MULTI (da DatiMacchina / redis...)
/// </summary>
protected bool isMulti(string idxMacchina)
{
return DataLayerObj.isMulti(idxMacchina);
}
/// <summary>
/// Verifica se la macchina MAIN sia SLAVE
/// </summary>
protected bool isSlave(string idxMacchina)
{
return DataLayerObj.isSlave(idxMacchina);
}
/// <summary>
/// conversione da tempo minuti centesimali a minuti/secondi
/// </summary>
/// <param name="valore"></param>
/// <returns></returns>
protected TimeSpan minCent2Sec(decimal valore)
{
TimeSpan answ = new TimeSpan(0, 0, 1);
try
{
answ = new TimeSpan(0, Convert.ToInt32(valore), Convert.ToInt32((valore - Convert.ToInt32(valore)) * 60));
}
catch
{ }
return answ;
}
#endregion Protected Methods
#region Public Methods
/// <summary>
/// cambia il colore del campo secondo la due date indicata
/// rosso: in ritardo (scaduta)
/// verde: > 2 week
/// giallo: altrimenti
/// </summary>
/// <param name="dueDate"></param>
/// <returns></returns>
public string cssDueDate(object dueDate)
{
DateTime oggi = DateTime.Today;
DateTime dataRif = oggi.AddDays(-1);
DateTime.TryParse(dueDate.ToString(), out dataRif);
string answ = "text-secondary";
if (dataRif < oggi)
{
answ = "text-danger";
}
else if (dataRif < oggi.AddDays(14))
{
answ = "text-warning";
}
else
{
answ = "text-success";
}
return answ;
}
/// <summary>
/// Conversione a bool del valore
/// </summary>
/// <param name="value"></param>
/// <returns></returns>
public bool getBool(object value)
{
bool answ = false;
bool.TryParse(value.ToString(), out answ);
return answ;
}
public string min2hour(object minutes)
{
string answ = "";
double minDbl = 0;
double.TryParse($"{minutes}", out minDbl);
answ = $"{minDbl / 60:N2}";
return answ;
}
/// <summary>
/// formatta in minuti/sec partendo da min.cent
/// </summary>
/// <param name="minCent"></param>
/// <returns></returns>
public string minSec(object minCent)
{
string answ = "";
try
{
answ = string.Format("{0:mm}:{0:ss}", minCent2Sec(Convert.ToDecimal(minCent.ToString().Replace(".", ","))));
}
catch
{ }
return answ;
}
/// <summary>
/// Solleva evento nuovo valore
/// </summary>
public void raiseNewVal()
{
// evento come nuovo...
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
}
/// <summary>
/// Solleva evento reset
/// </summary>
public void raiseReset()
{
if (eh_resetSelezione != null)
{
eh_resetSelezione(this, new EventArgs());
}
}
public void raiseSelNew()
{
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
}
/// <summary>
/// effettua traduzione del lemma
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(object lemmaRaw)
{
return user_std.UtSn.Traduci($"{lemmaRaw}");
}
/// <summary>
/// effettua traduzione del lemma
@@ -97,40 +291,6 @@ namespace MP_ADM
return user_std.UtSn.TraduciEn(lemma);
}
/// <summary>
/// formatta in minuti/sec partendo da min.cent
/// </summary>
/// <param name="minCent"></param>
/// <returns></returns>
public string minSec(object minCent)
{
string answ = "";
try
{
answ = string.Format("{0:mm}:{0:ss}", minCent2Sec(Convert.ToDecimal(minCent.ToString().Replace(".", ","))));
}
catch
{ }
return answ;
}
/// <summary>
/// conversione da tempo minuti centesimali a minuti/secondi
/// </summary>
/// <param name="valore"></param>
/// <returns></returns>
protected TimeSpan minCent2Sec(decimal valore)
{
TimeSpan answ = new TimeSpan(0, 0, 1);
try
{
answ = new TimeSpan(0, Convert.ToInt32(valore), Convert.ToInt32((valore - Convert.ToInt32(valore)) * 60));
}
catch
{ }
return answ;
}
#endregion utils
#endregion Public Methods
}
}
+22 -10
View File
@@ -5,16 +5,7 @@ namespace MP_ADM
{
public partial class CTrackBCode : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
((MoonPro)this.Master).headCssClass = "bg-secondary text-warning";
((MoonPro)this.Master).mainCssClass = "table-secondary";
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmCTrack_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptCTrack_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptCTrack_CodGruppo");
}
#region Private Methods
private void checkEnabled()
{
@@ -27,5 +18,26 @@ namespace MP_ADM
}
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
((MoonPro)this.Master).headCssClass = "bg-secondary text-warning";
((MoonPro)this.Master).mainCssClass = "table-secondary";
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmCTrack_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptCTrack_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptCTrack_CodGruppo");
}
#endregion Protected Methods
}
}
+1346 -1549
View File
File diff suppressed because it is too large Load Diff
+122 -7
View File
@@ -2,6 +2,10 @@
/*Import fonts!*/
@import url('./fonts.less');
@lgStart: #DEDEDE;
@lgMid: #CDCDCD;
@lgEnd: #FAFAFA;
.body {
font-family: 'Open Sans Condensed', sans-serif;
margin-top: 0px;
@@ -22,14 +26,125 @@ body {
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#787878', endColorstr='#DEDEDE', GradientType=0);
}
.sfondoMain {
/*background: #CDCDCD;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#787878), to(#DEDEDE));
background-image: -webkit-linear-gradient(top, #787878, 0%, #DEDEDE, 100%);
background-image: -moz-linear-gradient(top, #787878 0%, #DEDEDE 100%);
background-image: linear-gradient(to bottom, #787878 0%, #DEDEDE 100%);
.bgLightGrayUp {
background-image: svg-gradient(to bottom, @lgStart, @lgMid);
}
.bgLightGrayDown {
background-image: svg-gradient(to bottom, @lgMid, @lgEnd);
}
/*------------------------------------------------------------------
[ Shortcuts / .shortcuts ]
*/
@blSCut: 1.5rem;
.shortcuts {
text-align: center;
}
.shortcuts .shortcut {
min-width: @blSCut * 12;
min-height: @blSCut * 5;
display: inline-block;
padding: @blSCut*2/3 0em @blSCut*1/6;
margin: 0 0.2em 1.5em;
vertical-align: top;
text-decoration: none;
background: #F3F3F3;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee));
background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%);
background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%);
background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#787878', endColorstr='#DEDEDE', GradientType=0);*/
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
}
.shortcuts .shortcut-sm {
min-width: @blSCut * 7.5;
min-height: @blSCut * 3;
display: inline-block;
padding: @blSCut/4 0;
margin: 0 2px 1em;
vertical-align: top;
text-decoration: none;
background: #F3F3F3;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#ffffff), to(#eeeeee));
background-image: -webkit-linear-gradient(top, #ffffff, 0%, #eeeeee, 100%);
background-image: -moz-linear-gradient(top, #ffffff 0%, #eeeeee 100%);
background-image: linear-gradient(to bottom, #ffffff 0%, #eeeeee 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffeeeeee', GradientType=0);
border: 1px solid #ddd;
box-sizing: border-box;
border-radius: @blSCut/2;
}
.shortcuts .shortcut .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
color: #333;
}
.shortcuts .shortcut-sm .shortcut-icon {
width: 100%;
margin-top: 0;
margin-bottom: 0;
font-size: @blSCut*2;
color: #333;
}
.shortcuts .shortcut:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
border: 1px solid #0099FF;
}
.shortcuts .shortcut-sm:hover {
background: #E8E8E8;
background-image: -webkit-gradient(linear, left 0%, left 100%, from(#fafafa), to(#e1e1e1));
background-image: -webkit-linear-gradient(top, #fafafa, 0%, #e1e1e1, 100%);
background-image: -moz-linear-gradient(top, #fafafa 0%, #e1e1e1 100%);
background-image: linear-gradient(to bottom, #fafafa 0%, #e1e1e1 100%);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa', endColorstr='#ffe1e1e1', GradientType=0);
border: 1px solid #0099FF;
}
.shortcuts .shortcut:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
.shortcuts .shortcut-sm:active {
box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
}
.shortcuts .shortcut:hover .shortcut-icon {
color: #C93;
}
.shortcuts .shortcut-sm:hover .shortcut-icon {
color: #666;
}
.shortcuts .shortcut-label {
display: block;
margin-top: .75em;
font-size: @blSCut*0.75;
font-weight: bold;
color: #333;
border-top: 1px solid #DEDEDE;
}
.table-sm > thead > tr > th, .table-sm > tbody > tr > th, .table-sm > tfoot > tr > th, .table-sm > thead > tr > td, .table-sm > tbody > tr > td, .table-sm > tfoot > tr > td {
+1 -1
View File
File diff suppressed because one or more lines are too long
+3550 -3337
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+378 -106
View File
@@ -1,51 +1,268 @@
/*!
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap Reboot v5.3.3 (https://getbootstrap.com/)
* Copyright 2011-2024 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
* Forked from Normalize.css, licensed MIT (https://github.com/necolas/normalize.css/blob/master/LICENSE.md)
*/
:root,
[data-bs-theme=light] {
--bs-blue: #0d6efd;
--bs-indigo: #6610f2;
--bs-purple: #6f42c1;
--bs-pink: #d63384;
--bs-red: #dc3545;
--bs-orange: #fd7e14;
--bs-yellow: #ffc107;
--bs-green: #198754;
--bs-teal: #20c997;
--bs-cyan: #0dcaf0;
--bs-black: #000;
--bs-white: #fff;
--bs-gray: #6c757d;
--bs-gray-dark: #343a40;
--bs-gray-100: #f8f9fa;
--bs-gray-200: #e9ecef;
--bs-gray-300: #dee2e6;
--bs-gray-400: #ced4da;
--bs-gray-500: #adb5bd;
--bs-gray-600: #6c757d;
--bs-gray-700: #495057;
--bs-gray-800: #343a40;
--bs-gray-900: #212529;
--bs-primary: #0d6efd;
--bs-secondary: #6c757d;
--bs-success: #198754;
--bs-info: #0dcaf0;
--bs-warning: #ffc107;
--bs-danger: #dc3545;
--bs-light: #f8f9fa;
--bs-dark: #212529;
--bs-primary-rgb: 13, 110, 253;
--bs-secondary-rgb: 108, 117, 125;
--bs-success-rgb: 25, 135, 84;
--bs-info-rgb: 13, 202, 240;
--bs-warning-rgb: 255, 193, 7;
--bs-danger-rgb: 220, 53, 69;
--bs-light-rgb: 248, 249, 250;
--bs-dark-rgb: 33, 37, 41;
--bs-primary-text-emphasis: #052c65;
--bs-secondary-text-emphasis: #2b2f32;
--bs-success-text-emphasis: #0a3622;
--bs-info-text-emphasis: #055160;
--bs-warning-text-emphasis: #664d03;
--bs-danger-text-emphasis: #58151c;
--bs-light-text-emphasis: #495057;
--bs-dark-text-emphasis: #495057;
--bs-primary-bg-subtle: #cfe2ff;
--bs-secondary-bg-subtle: #e2e3e5;
--bs-success-bg-subtle: #d1e7dd;
--bs-info-bg-subtle: #cff4fc;
--bs-warning-bg-subtle: #fff3cd;
--bs-danger-bg-subtle: #f8d7da;
--bs-light-bg-subtle: #fcfcfd;
--bs-dark-bg-subtle: #ced4da;
--bs-primary-border-subtle: #9ec5fe;
--bs-secondary-border-subtle: #c4c8cb;
--bs-success-border-subtle: #a3cfbb;
--bs-info-border-subtle: #9eeaf9;
--bs-warning-border-subtle: #ffe69c;
--bs-danger-border-subtle: #f1aeb5;
--bs-light-border-subtle: #e9ecef;
--bs-dark-border-subtle: #adb5bd;
--bs-white-rgb: 255, 255, 255;
--bs-black-rgb: 0, 0, 0;
--bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
--bs-body-font-family: var(--bs-font-sans-serif);
--bs-body-font-size: 1rem;
--bs-body-font-weight: 400;
--bs-body-line-height: 1.5;
--bs-body-color: #212529;
--bs-body-color-rgb: 33, 37, 41;
--bs-body-bg: #fff;
--bs-body-bg-rgb: 255, 255, 255;
--bs-emphasis-color: #000;
--bs-emphasis-color-rgb: 0, 0, 0;
--bs-secondary-color: rgba(33, 37, 41, 0.75);
--bs-secondary-color-rgb: 33, 37, 41;
--bs-secondary-bg: #e9ecef;
--bs-secondary-bg-rgb: 233, 236, 239;
--bs-tertiary-color: rgba(33, 37, 41, 0.5);
--bs-tertiary-color-rgb: 33, 37, 41;
--bs-tertiary-bg: #f8f9fa;
--bs-tertiary-bg-rgb: 248, 249, 250;
--bs-heading-color: inherit;
--bs-link-color: #0d6efd;
--bs-link-color-rgb: 13, 110, 253;
--bs-link-decoration: underline;
--bs-link-hover-color: #0a58ca;
--bs-link-hover-color-rgb: 10, 88, 202;
--bs-code-color: #d63384;
--bs-highlight-color: #212529;
--bs-highlight-bg: #fff3cd;
--bs-border-width: 1px;
--bs-border-style: solid;
--bs-border-color: #dee2e6;
--bs-border-color-translucent: rgba(0, 0, 0, 0.175);
--bs-border-radius: 0.375rem;
--bs-border-radius-sm: 0.25rem;
--bs-border-radius-lg: 0.5rem;
--bs-border-radius-xl: 1rem;
--bs-border-radius-xxl: 2rem;
--bs-border-radius-2xl: var(--bs-border-radius-xxl);
--bs-border-radius-pill: 50rem;
--bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
--bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
--bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
--bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
--bs-focus-ring-width: 0.25rem;
--bs-focus-ring-opacity: 0.25;
--bs-focus-ring-color: rgba(13, 110, 253, 0.25);
--bs-form-valid-color: #198754;
--bs-form-valid-border-color: #198754;
--bs-form-invalid-color: #dc3545;
--bs-form-invalid-border-color: #dc3545;
}
[data-bs-theme=dark] {
color-scheme: dark;
--bs-body-color: #dee2e6;
--bs-body-color-rgb: 222, 226, 230;
--bs-body-bg: #212529;
--bs-body-bg-rgb: 33, 37, 41;
--bs-emphasis-color: #fff;
--bs-emphasis-color-rgb: 255, 255, 255;
--bs-secondary-color: rgba(222, 226, 230, 0.75);
--bs-secondary-color-rgb: 222, 226, 230;
--bs-secondary-bg: #343a40;
--bs-secondary-bg-rgb: 52, 58, 64;
--bs-tertiary-color: rgba(222, 226, 230, 0.5);
--bs-tertiary-color-rgb: 222, 226, 230;
--bs-tertiary-bg: #2b3035;
--bs-tertiary-bg-rgb: 43, 48, 53;
--bs-primary-text-emphasis: #6ea8fe;
--bs-secondary-text-emphasis: #a7acb1;
--bs-success-text-emphasis: #75b798;
--bs-info-text-emphasis: #6edff6;
--bs-warning-text-emphasis: #ffda6a;
--bs-danger-text-emphasis: #ea868f;
--bs-light-text-emphasis: #f8f9fa;
--bs-dark-text-emphasis: #dee2e6;
--bs-primary-bg-subtle: #031633;
--bs-secondary-bg-subtle: #161719;
--bs-success-bg-subtle: #051b11;
--bs-info-bg-subtle: #032830;
--bs-warning-bg-subtle: #332701;
--bs-danger-bg-subtle: #2c0b0e;
--bs-light-bg-subtle: #343a40;
--bs-dark-bg-subtle: #1a1d20;
--bs-primary-border-subtle: #084298;
--bs-secondary-border-subtle: #41464b;
--bs-success-border-subtle: #0f5132;
--bs-info-border-subtle: #087990;
--bs-warning-border-subtle: #997404;
--bs-danger-border-subtle: #842029;
--bs-light-border-subtle: #495057;
--bs-dark-border-subtle: #343a40;
--bs-heading-color: inherit;
--bs-link-color: #6ea8fe;
--bs-link-hover-color: #8bb9fe;
--bs-link-color-rgb: 110, 168, 254;
--bs-link-hover-color-rgb: 139, 185, 254;
--bs-code-color: #e685b5;
--bs-highlight-color: #dee2e6;
--bs-highlight-bg: #664d03;
--bs-border-color: #495057;
--bs-border-color-translucent: rgba(255, 255, 255, 0.15);
--bs-form-valid-color: #75b798;
--bs-form-valid-border-color: #75b798;
--bs-form-invalid-color: #ea868f;
--bs-form-invalid-border-color: #ea868f;
}
*,
*::before,
*::after {
box-sizing: border-box;
}
html {
font-family: sans-serif;
line-height: 1.15;
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
display: block;
@media (prefers-reduced-motion: no-preference) {
:root {
scroll-behavior: smooth;
}
}
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-size: 1rem;
font-weight: 400;
line-height: 1.5;
color: #212529;
text-align: left;
background-color: #fff;
}
[tabindex="-1"]:focus:not(:focus-visible) {
outline: 0 !important;
font-family: var(--bs-body-font-family);
font-size: var(--bs-body-font-size);
font-weight: var(--bs-body-font-weight);
line-height: var(--bs-body-line-height);
color: var(--bs-body-color);
text-align: var(--bs-body-text-align);
background-color: var(--bs-body-bg);
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
hr {
box-sizing: content-box;
height: 0;
overflow: visible;
margin: 1rem 0;
color: inherit;
border: 0;
border-top: var(--bs-border-width) solid;
opacity: 0.25;
}
h1, h2, h3, h4, h5, h6 {
h6, h5, h4, h3, h2, h1 {
margin-top: 0;
margin-bottom: 0.5rem;
font-weight: 500;
line-height: 1.2;
color: var(--bs-heading-color);
}
h1 {
font-size: calc(1.375rem + 1.5vw);
}
@media (min-width: 1200px) {
h1 {
font-size: 2.5rem;
}
}
h2 {
font-size: calc(1.325rem + 0.9vw);
}
@media (min-width: 1200px) {
h2 {
font-size: 2rem;
}
}
h3 {
font-size: calc(1.3rem + 0.6vw);
}
@media (min-width: 1200px) {
h3 {
font-size: 1.75rem;
}
}
h4 {
font-size: calc(1.275rem + 0.3vw);
}
@media (min-width: 1200px) {
h4 {
font-size: 1.5rem;
}
}
h5 {
font-size: 1.25rem;
}
h6 {
font-size: 1rem;
}
p {
@@ -53,13 +270,10 @@ p {
margin-bottom: 1rem;
}
abbr[title],
abbr[data-original-title] {
text-decoration: underline;
abbr[title] {
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
cursor: help;
border-bottom: 0;
-webkit-text-decoration-skip-ink: none;
text-decoration-skip-ink: none;
}
@@ -70,6 +284,11 @@ address {
line-height: inherit;
}
ol,
ul {
padding-left: 2rem;
}
ol,
ul,
dl {
@@ -89,7 +308,7 @@ dt {
}
dd {
margin-bottom: .5rem;
margin-bottom: 0.5rem;
margin-left: 0;
}
@@ -103,42 +322,40 @@ strong {
}
small {
font-size: 80%;
font-size: 0.875em;
}
mark {
padding: 0.1875em;
color: var(--bs-highlight-color);
background-color: var(--bs-highlight-bg);
}
sub,
sup {
position: relative;
font-size: 75%;
font-size: 0.75em;
line-height: 0;
vertical-align: baseline;
}
sub {
bottom: -.25em;
bottom: -0.25em;
}
sup {
top: -.5em;
top: -0.5em;
}
a {
color: #007bff;
text-decoration: none;
background-color: transparent;
}
a:hover {
color: #0056b3;
color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
text-decoration: underline;
}
a:not([href]):not([class]) {
color: inherit;
text-decoration: none;
a:hover {
--bs-link-color-rgb: var(--bs-link-hover-color-rgb);
}
a:not([href]):not([class]):hover {
a:not([href]):not([class]), a:not([href]):not([class]):hover {
color: inherit;
text-decoration: none;
}
@@ -147,59 +364,91 @@ pre,
code,
kbd,
samp {
font-family: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
font-family: var(--bs-font-monospace);
font-size: 1em;
}
pre {
display: block;
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
-ms-overflow-style: scrollbar;
font-size: 0.875em;
}
pre code {
font-size: inherit;
color: inherit;
word-break: normal;
}
code {
font-size: 0.875em;
color: var(--bs-code-color);
word-wrap: break-word;
}
a > code {
color: inherit;
}
kbd {
padding: 0.1875rem 0.375rem;
font-size: 0.875em;
color: var(--bs-body-bg);
background-color: var(--bs-body-color);
border-radius: 0.25rem;
}
kbd kbd {
padding: 0;
font-size: 1em;
}
figure {
margin: 0 0 1rem;
}
img {
vertical-align: middle;
border-style: none;
}
img,
svg {
overflow: hidden;
vertical-align: middle;
}
table {
caption-side: bottom;
border-collapse: collapse;
}
caption {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
color: #6c757d;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
color: var(--bs-secondary-color);
text-align: left;
caption-side: bottom;
}
th {
text-align: inherit;
text-align: -webkit-match-parent;
}
thead,
tbody,
tfoot,
tr,
td,
th {
border-color: inherit;
border-style: solid;
border-width: 0;
}
label {
display: inline-block;
margin-bottom: 0.5rem;
}
button {
border-radius: 0;
}
button:focus {
outline: 1px dotted;
outline: 5px auto -webkit-focus-ring-color;
button:focus:not(:focus-visible) {
outline: 0;
}
input,
@@ -213,54 +462,45 @@ textarea {
line-height: inherit;
}
button,
input {
overflow: visible;
}
button,
select {
text-transform: none;
}
[role="button"] {
[role=button] {
cursor: pointer;
}
select {
word-wrap: normal;
}
button,
[type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
select:disabled {
opacity: 1;
}
[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
display: none !important;
}
button,
[type=button],
[type=reset],
[type=submit] {
-webkit-appearance: button;
}
button:not(:disabled),
[type="button"]:not(:disabled),
[type="reset"]:not(:disabled),
[type="submit"]:not(:disabled) {
[type=button]:not(:disabled),
[type=reset]:not(:disabled),
[type=submit]:not(:disabled) {
cursor: pointer;
}
button::-moz-focus-inner,
[type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
::-moz-focus-inner {
padding: 0;
border-style: none;
}
input[type="radio"],
input[type="checkbox"] {
box-sizing: border-box;
padding: 0;
}
textarea {
overflow: auto;
resize: vertical;
}
@@ -272,33 +512,55 @@ fieldset {
}
legend {
display: block;
float: left;
width: 100%;
max-width: 100%;
padding: 0;
margin-bottom: .5rem;
font-size: 1.5rem;
margin-bottom: 0.5rem;
font-size: calc(1.275rem + 0.3vw);
line-height: inherit;
color: inherit;
white-space: normal;
}
@media (min-width: 1200px) {
legend {
font-size: 1.5rem;
}
}
legend + * {
clear: left;
}
progress {
vertical-align: baseline;
::-webkit-datetime-edit-fields-wrapper,
::-webkit-datetime-edit-text,
::-webkit-datetime-edit-minute,
::-webkit-datetime-edit-hour-field,
::-webkit-datetime-edit-day-field,
::-webkit-datetime-edit-month-field,
::-webkit-datetime-edit-year-field {
padding: 0;
}
[type="number"]::-webkit-inner-spin-button,
[type="number"]::-webkit-outer-spin-button {
::-webkit-inner-spin-button {
height: auto;
}
[type="search"] {
[type=search] {
-webkit-appearance: textfield;
outline-offset: -2px;
}
/* rtl:raw:
[type="tel"],
[type="url"],
[type="email"],
[type="number"] {
direction: ltr;
}
*/
::-webkit-search-decoration {
-webkit-appearance: none;
}
[type="search"]::-webkit-search-decoration {
-webkit-appearance: none;
::-webkit-color-swatch-wrapper {
padding: 0;
}
::-webkit-file-upload-button {
@@ -306,20 +568,30 @@ progress {
-webkit-appearance: button;
}
::file-selector-button {
font: inherit;
-webkit-appearance: button;
}
output {
display: inline-block;
}
iframe {
border: 0;
}
summary {
display: list-item;
cursor: pointer;
}
template {
display: none;
progress {
vertical-align: baseline;
}
[hidden] {
display: none !important;
}
/*# sourceMappingURL=bootstrap-reboot.css.map */
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+594
View File
@@ -0,0 +1,594 @@
/*!
* Bootstrap Reboot v5.3.3 (https://getbootstrap.com/)
* Copyright 2011-2024 The Bootstrap Authors
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
:root,
[data-bs-theme=light] {
--bs-blue: #0d6efd;
--bs-indigo: #6610f2;
--bs-purple: #6f42c1;
--bs-pink: #d63384;
--bs-red: #dc3545;
--bs-orange: #fd7e14;
--bs-yellow: #ffc107;
--bs-green: #198754;
--bs-teal: #20c997;
--bs-cyan: #0dcaf0;
--bs-black: #000;
--bs-white: #fff;
--bs-gray: #6c757d;
--bs-gray-dark: #343a40;
--bs-gray-100: #f8f9fa;
--bs-gray-200: #e9ecef;
--bs-gray-300: #dee2e6;
--bs-gray-400: #ced4da;
--bs-gray-500: #adb5bd;
--bs-gray-600: #6c757d;
--bs-gray-700: #495057;
--bs-gray-800: #343a40;
--bs-gray-900: #212529;
--bs-primary: #0d6efd;
--bs-secondary: #6c757d;
--bs-success: #198754;
--bs-info: #0dcaf0;
--bs-warning: #ffc107;
--bs-danger: #dc3545;
--bs-light: #f8f9fa;
--bs-dark: #212529;
--bs-primary-rgb: 13, 110, 253;
--bs-secondary-rgb: 108, 117, 125;
--bs-success-rgb: 25, 135, 84;
--bs-info-rgb: 13, 202, 240;
--bs-warning-rgb: 255, 193, 7;
--bs-danger-rgb: 220, 53, 69;
--bs-light-rgb: 248, 249, 250;
--bs-dark-rgb: 33, 37, 41;
--bs-primary-text-emphasis: #052c65;
--bs-secondary-text-emphasis: #2b2f32;
--bs-success-text-emphasis: #0a3622;
--bs-info-text-emphasis: #055160;
--bs-warning-text-emphasis: #664d03;
--bs-danger-text-emphasis: #58151c;
--bs-light-text-emphasis: #495057;
--bs-dark-text-emphasis: #495057;
--bs-primary-bg-subtle: #cfe2ff;
--bs-secondary-bg-subtle: #e2e3e5;
--bs-success-bg-subtle: #d1e7dd;
--bs-info-bg-subtle: #cff4fc;
--bs-warning-bg-subtle: #fff3cd;
--bs-danger-bg-subtle: #f8d7da;
--bs-light-bg-subtle: #fcfcfd;
--bs-dark-bg-subtle: #ced4da;
--bs-primary-border-subtle: #9ec5fe;
--bs-secondary-border-subtle: #c4c8cb;
--bs-success-border-subtle: #a3cfbb;
--bs-info-border-subtle: #9eeaf9;
--bs-warning-border-subtle: #ffe69c;
--bs-danger-border-subtle: #f1aeb5;
--bs-light-border-subtle: #e9ecef;
--bs-dark-border-subtle: #adb5bd;
--bs-white-rgb: 255, 255, 255;
--bs-black-rgb: 0, 0, 0;
--bs-font-sans-serif: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", "Noto Sans", "Liberation Sans", Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--bs-font-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
--bs-gradient: linear-gradient(180deg, rgba(255, 255, 255, 0.15), rgba(255, 255, 255, 0));
--bs-body-font-family: var(--bs-font-sans-serif);
--bs-body-font-size: 1rem;
--bs-body-font-weight: 400;
--bs-body-line-height: 1.5;
--bs-body-color: #212529;
--bs-body-color-rgb: 33, 37, 41;
--bs-body-bg: #fff;
--bs-body-bg-rgb: 255, 255, 255;
--bs-emphasis-color: #000;
--bs-emphasis-color-rgb: 0, 0, 0;
--bs-secondary-color: rgba(33, 37, 41, 0.75);
--bs-secondary-color-rgb: 33, 37, 41;
--bs-secondary-bg: #e9ecef;
--bs-secondary-bg-rgb: 233, 236, 239;
--bs-tertiary-color: rgba(33, 37, 41, 0.5);
--bs-tertiary-color-rgb: 33, 37, 41;
--bs-tertiary-bg: #f8f9fa;
--bs-tertiary-bg-rgb: 248, 249, 250;
--bs-heading-color: inherit;
--bs-link-color: #0d6efd;
--bs-link-color-rgb: 13, 110, 253;
--bs-link-decoration: underline;
--bs-link-hover-color: #0a58ca;
--bs-link-hover-color-rgb: 10, 88, 202;
--bs-code-color: #d63384;
--bs-highlight-color: #212529;
--bs-highlight-bg: #fff3cd;
--bs-border-width: 1px;
--bs-border-style: solid;
--bs-border-color: #dee2e6;
--bs-border-color-translucent: rgba(0, 0, 0, 0.175);
--bs-border-radius: 0.375rem;
--bs-border-radius-sm: 0.25rem;
--bs-border-radius-lg: 0.5rem;
--bs-border-radius-xl: 1rem;
--bs-border-radius-xxl: 2rem;
--bs-border-radius-2xl: var(--bs-border-radius-xxl);
--bs-border-radius-pill: 50rem;
--bs-box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15);
--bs-box-shadow-sm: 0 0.125rem 0.25rem rgba(0, 0, 0, 0.075);
--bs-box-shadow-lg: 0 1rem 3rem rgba(0, 0, 0, 0.175);
--bs-box-shadow-inset: inset 0 1px 2px rgba(0, 0, 0, 0.075);
--bs-focus-ring-width: 0.25rem;
--bs-focus-ring-opacity: 0.25;
--bs-focus-ring-color: rgba(13, 110, 253, 0.25);
--bs-form-valid-color: #198754;
--bs-form-valid-border-color: #198754;
--bs-form-invalid-color: #dc3545;
--bs-form-invalid-border-color: #dc3545;
}
[data-bs-theme=dark] {
color-scheme: dark;
--bs-body-color: #dee2e6;
--bs-body-color-rgb: 222, 226, 230;
--bs-body-bg: #212529;
--bs-body-bg-rgb: 33, 37, 41;
--bs-emphasis-color: #fff;
--bs-emphasis-color-rgb: 255, 255, 255;
--bs-secondary-color: rgba(222, 226, 230, 0.75);
--bs-secondary-color-rgb: 222, 226, 230;
--bs-secondary-bg: #343a40;
--bs-secondary-bg-rgb: 52, 58, 64;
--bs-tertiary-color: rgba(222, 226, 230, 0.5);
--bs-tertiary-color-rgb: 222, 226, 230;
--bs-tertiary-bg: #2b3035;
--bs-tertiary-bg-rgb: 43, 48, 53;
--bs-primary-text-emphasis: #6ea8fe;
--bs-secondary-text-emphasis: #a7acb1;
--bs-success-text-emphasis: #75b798;
--bs-info-text-emphasis: #6edff6;
--bs-warning-text-emphasis: #ffda6a;
--bs-danger-text-emphasis: #ea868f;
--bs-light-text-emphasis: #f8f9fa;
--bs-dark-text-emphasis: #dee2e6;
--bs-primary-bg-subtle: #031633;
--bs-secondary-bg-subtle: #161719;
--bs-success-bg-subtle: #051b11;
--bs-info-bg-subtle: #032830;
--bs-warning-bg-subtle: #332701;
--bs-danger-bg-subtle: #2c0b0e;
--bs-light-bg-subtle: #343a40;
--bs-dark-bg-subtle: #1a1d20;
--bs-primary-border-subtle: #084298;
--bs-secondary-border-subtle: #41464b;
--bs-success-border-subtle: #0f5132;
--bs-info-border-subtle: #087990;
--bs-warning-border-subtle: #997404;
--bs-danger-border-subtle: #842029;
--bs-light-border-subtle: #495057;
--bs-dark-border-subtle: #343a40;
--bs-heading-color: inherit;
--bs-link-color: #6ea8fe;
--bs-link-hover-color: #8bb9fe;
--bs-link-color-rgb: 110, 168, 254;
--bs-link-hover-color-rgb: 139, 185, 254;
--bs-code-color: #e685b5;
--bs-highlight-color: #dee2e6;
--bs-highlight-bg: #664d03;
--bs-border-color: #495057;
--bs-border-color-translucent: rgba(255, 255, 255, 0.15);
--bs-form-valid-color: #75b798;
--bs-form-valid-border-color: #75b798;
--bs-form-invalid-color: #ea868f;
--bs-form-invalid-border-color: #ea868f;
}
*,
*::before,
*::after {
box-sizing: border-box;
}
@media (prefers-reduced-motion: no-preference) {
:root {
scroll-behavior: smooth;
}
}
body {
margin: 0;
font-family: var(--bs-body-font-family);
font-size: var(--bs-body-font-size);
font-weight: var(--bs-body-font-weight);
line-height: var(--bs-body-line-height);
color: var(--bs-body-color);
text-align: var(--bs-body-text-align);
background-color: var(--bs-body-bg);
-webkit-text-size-adjust: 100%;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
}
hr {
margin: 1rem 0;
color: inherit;
border: 0;
border-top: var(--bs-border-width) solid;
opacity: 0.25;
}
h6, h5, h4, h3, h2, h1 {
margin-top: 0;
margin-bottom: 0.5rem;
font-weight: 500;
line-height: 1.2;
color: var(--bs-heading-color);
}
h1 {
font-size: calc(1.375rem + 1.5vw);
}
@media (min-width: 1200px) {
h1 {
font-size: 2.5rem;
}
}
h2 {
font-size: calc(1.325rem + 0.9vw);
}
@media (min-width: 1200px) {
h2 {
font-size: 2rem;
}
}
h3 {
font-size: calc(1.3rem + 0.6vw);
}
@media (min-width: 1200px) {
h3 {
font-size: 1.75rem;
}
}
h4 {
font-size: calc(1.275rem + 0.3vw);
}
@media (min-width: 1200px) {
h4 {
font-size: 1.5rem;
}
}
h5 {
font-size: 1.25rem;
}
h6 {
font-size: 1rem;
}
p {
margin-top: 0;
margin-bottom: 1rem;
}
abbr[title] {
-webkit-text-decoration: underline dotted;
text-decoration: underline dotted;
cursor: help;
-webkit-text-decoration-skip-ink: none;
text-decoration-skip-ink: none;
}
address {
margin-bottom: 1rem;
font-style: normal;
line-height: inherit;
}
ol,
ul {
padding-right: 2rem;
}
ol,
ul,
dl {
margin-top: 0;
margin-bottom: 1rem;
}
ol ol,
ul ul,
ol ul,
ul ol {
margin-bottom: 0;
}
dt {
font-weight: 700;
}
dd {
margin-bottom: 0.5rem;
margin-right: 0;
}
blockquote {
margin: 0 0 1rem;
}
b,
strong {
font-weight: bolder;
}
small {
font-size: 0.875em;
}
mark {
padding: 0.1875em;
color: var(--bs-highlight-color);
background-color: var(--bs-highlight-bg);
}
sub,
sup {
position: relative;
font-size: 0.75em;
line-height: 0;
vertical-align: baseline;
}
sub {
bottom: -0.25em;
}
sup {
top: -0.5em;
}
a {
color: rgba(var(--bs-link-color-rgb), var(--bs-link-opacity, 1));
text-decoration: underline;
}
a:hover {
--bs-link-color-rgb: var(--bs-link-hover-color-rgb);
}
a:not([href]):not([class]), a:not([href]):not([class]):hover {
color: inherit;
text-decoration: none;
}
pre,
code,
kbd,
samp {
font-family: var(--bs-font-monospace);
font-size: 1em;
}
pre {
display: block;
margin-top: 0;
margin-bottom: 1rem;
overflow: auto;
font-size: 0.875em;
}
pre code {
font-size: inherit;
color: inherit;
word-break: normal;
}
code {
font-size: 0.875em;
color: var(--bs-code-color);
word-wrap: break-word;
}
a > code {
color: inherit;
}
kbd {
padding: 0.1875rem 0.375rem;
font-size: 0.875em;
color: var(--bs-body-bg);
background-color: var(--bs-body-color);
border-radius: 0.25rem;
}
kbd kbd {
padding: 0;
font-size: 1em;
}
figure {
margin: 0 0 1rem;
}
img,
svg {
vertical-align: middle;
}
table {
caption-side: bottom;
border-collapse: collapse;
}
caption {
padding-top: 0.5rem;
padding-bottom: 0.5rem;
color: var(--bs-secondary-color);
text-align: right;
}
th {
text-align: inherit;
text-align: -webkit-match-parent;
}
thead,
tbody,
tfoot,
tr,
td,
th {
border-color: inherit;
border-style: solid;
border-width: 0;
}
label {
display: inline-block;
}
button {
border-radius: 0;
}
button:focus:not(:focus-visible) {
outline: 0;
}
input,
button,
select,
optgroup,
textarea {
margin: 0;
font-family: inherit;
font-size: inherit;
line-height: inherit;
}
button,
select {
text-transform: none;
}
[role=button] {
cursor: pointer;
}
select {
word-wrap: normal;
}
select:disabled {
opacity: 1;
}
[list]:not([type=date]):not([type=datetime-local]):not([type=month]):not([type=week]):not([type=time])::-webkit-calendar-picker-indicator {
display: none !important;
}
button,
[type=button],
[type=reset],
[type=submit] {
-webkit-appearance: button;
}
button:not(:disabled),
[type=button]:not(:disabled),
[type=reset]:not(:disabled),
[type=submit]:not(:disabled) {
cursor: pointer;
}
::-moz-focus-inner {
padding: 0;
border-style: none;
}
textarea {
resize: vertical;
}
fieldset {
min-width: 0;
padding: 0;
margin: 0;
border: 0;
}
legend {
float: right;
width: 100%;
padding: 0;
margin-bottom: 0.5rem;
font-size: calc(1.275rem + 0.3vw);
line-height: inherit;
}
@media (min-width: 1200px) {
legend {
font-size: 1.5rem;
}
}
legend + * {
clear: right;
}
::-webkit-datetime-edit-fields-wrapper,
::-webkit-datetime-edit-text,
::-webkit-datetime-edit-minute,
::-webkit-datetime-edit-hour-field,
::-webkit-datetime-edit-day-field,
::-webkit-datetime-edit-month-field,
::-webkit-datetime-edit-year-field {
padding: 0;
}
::-webkit-inner-spin-button {
height: auto;
}
[type=search] {
-webkit-appearance: textfield;
outline-offset: -2px;
}
[type="tel"],
[type="url"],
[type="email"],
[type="number"] {
direction: ltr;
}
::-webkit-search-decoration {
-webkit-appearance: none;
}
::-webkit-color-swatch-wrapper {
padding: 0;
}
::-webkit-file-upload-button {
font: inherit;
-webkit-appearance: button;
}
::file-selector-button {
font: inherit;
-webkit-appearance: button;
}
output {
display: inline-block;
}
iframe {
border: 0;
}
summary {
display: list-item;
cursor: pointer;
}
progress {
vertical-align: baseline;
}
[hidden] {
display: none !important;
}
/*# sourceMappingURL=bootstrap-reboot.rtl.css.map */
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+9284 -7486
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+4 -5
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+12030
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+6 -6
View File
@@ -3,13 +3,13 @@
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="row">
<div class="col-3 py-4">
<asp:LinkButton runat="server" ID="lbtProImportIS" CssClass="btn btn-outline-info btn-block py-3" OnClick="lbtProImportIS_Click">
<div><i class="fa fa-download fa-4x"></i></div>
<div class="font-weight-bold mt-1 table-dark text-light">
Esegui Import + Allineamento Dati
</div>
<asp:LinkButton runat="server" ID="lbtProImportIS" CssClass="btn btn-outline-info w-100 py-3" OnClick="lbtProImportIS_Click">
<div><i class="fa fa-download fa-4x"></i></div>
<div class="font-weight-bold mt-1 bg-dark text-light">
Esegui Import + Allineamento Dati
</div>
</asp:LinkButton>
<asp:Label runat="server" ID="lblDataImportOut" CssClass="text-danger" />
</div>
</div>
</asp:Content>
</asp:Content>
+16 -4
View File
@@ -5,10 +5,7 @@ namespace MP_ADM
{
public partial class DataImport : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
}
#region Private Methods
private void checkEnabled()
{
@@ -22,6 +19,10 @@ namespace MP_ADM
lblDataImportOut.Text = messaggio;
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// Esegue import dati
/// </summary>
@@ -37,5 +38,16 @@ namespace MP_ADM
DataLayerObj.taWKS.All_ImportFile_Process(null, null, null, null, 0, 0);
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
}
#endregion Protected Methods
}
}
+19 -17
View File
@@ -1,32 +1,34 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM {
public partial class DataImport {
namespace MP_ADM
{
public partial class DataImport
{
/// <summary>
/// Controllo lbtProImportIS.
/// lbtProImportIS control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtProImportIS;
/// <summary>
/// Controllo lblDataImportOut.
/// lblDataImportOut control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDataImportOut;
}
+39 -27
View File
@@ -5,18 +5,7 @@ namespace MP_ADM
{
public partial class GestKIT : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "KIT";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
mod_barcode.eh_comandoRegistrato += Mod_barcode_eh_comandoRegistrato;
mod_barcode.eh_dataRead += Mod_barcode_eh_dataRead;
mod_gestKIT.eh_selKit += Mod_gestKIT_eh_selKit;
}
#region Private Methods
private void checkEnabled()
{
@@ -31,21 +20,6 @@ namespace MP_ADM
}
}
private void Mod_gestKIT_eh_selKit(object sender, EventArgs e)
{
// invio ultimo kit creato a barcode...
mod_barcode.BCodeVal = mod_gestKIT.lastKitMade;
mod_barcode.processInput();
}
private void Mod_barcode_eh_dataRead(object sender, EventArgs e)
{
// verifico input su KIT x lettura "grezza"
string rawInput = mod_barcode.rawInput;
mod_gestKIT.lastInput = rawInput;
mod_gestKIT.doUpdate();
}
private void Mod_barcode_eh_comandoRegistrato(object sender, EventArgs e)
{
// verifico input su KIT x comando completo
@@ -63,5 +37,43 @@ namespace MP_ADM
}
mod_gestKIT.doUpdate();
}
private void Mod_barcode_eh_dataRead(object sender, EventArgs e)
{
// verifico input su KIT x lettura "grezza"
string rawInput = mod_barcode.rawInput;
mod_gestKIT.lastInput = rawInput;
mod_gestKIT.doUpdate();
}
private void Mod_gestKIT_eh_selKit(object sender, EventArgs e)
{
// invio ultimo kit creato a barcode...
mod_barcode.BCodeVal = mod_gestKIT.lastKitMade;
mod_barcode.processInput();
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "KIT";
mod_gestPromODL.codOrdPre = mod_barcode.codOrdPre;
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
mod_barcode.eh_comandoRegistrato += Mod_barcode_eh_comandoRegistrato;
mod_barcode.eh_dataRead += Mod_barcode_eh_dataRead;
mod_gestKIT.eh_selKit += Mod_gestKIT_eh_selKit;
}
#endregion Protected Methods
}
}
+31 -29
View File
@@ -1,59 +1,61 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace MP_ADM {
public partial class GestKIT {
namespace MP_ADM
{
public partial class GestKIT
{
/// <summary>
/// Controllo lblDataImportOut.
/// lblDataImportOut control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDataImportOut;
/// <summary>
/// Controllo divContent.
/// divContent control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divContent;
/// <summary>
/// Controllo mod_gestKIT.
/// mod_gestKIT control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_gestKIT mod_gestKIT;
/// <summary>
/// Controllo mod_barcode.
/// mod_barcode control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_barcode mod_barcode;
/// <summary>
/// Controllo mod_gestPromODL.
/// mod_gestPromODL control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_gestPromODL mod_gestPromODL;
}
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class HwSwInfo : BasePage
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+7
View File
@@ -0,0 +1,7 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="ImageArchive.aspx.cs" Inherits="MP_ADM.ImageArchive" %>
<%@ Register Src="~/WebUserControls/cmp_ImageArchive.ascx" TagPrefix="uc1" TagName="cmp_ImageArchive" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:cmp_ImageArchive runat="server" id="cmp_ImageArchive" />
</asp:Content>
+24
View File
@@ -0,0 +1,24 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM
{
public partial class ImageArchive : System.Web.UI.Page
{
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
}
}
#endregion Protected Methods
}
}
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_ADM
{
public partial class ImageArchive
{
/// <summary>
/// Controllo cmp_ImageArchive.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_ADM.WebUserControls.cmp_ImageArchive cmp_ImageArchive;
}
}
@@ -0,0 +1,8 @@
is_global = true
build_property.TargetFramework =
build_property.TargetPlatformMinVersion =
build_property.UsingMicrosoftNETSdkWeb =
build_property.ProjectTypeGuids = {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}
build_property.PublishSingleFile =
build_property.IncludeAllContentForSelfExtract =
build_property._SupportedPlatformList =
+378 -132
View File
@@ -46,60 +46,69 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="AegisImplicitMail, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.0.3\lib\AegisImplicitMail.dll</HintPath>
</Reference>
<Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
</Reference>
<Reference Include="AspNet.ScriptManager.bootstrap, Version=4.5.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.bootstrap.4.5.2\lib\net45\AspNet.ScriptManager.bootstrap.dll</HintPath>
</Reference>
<Reference Include="AspNet.ScriptManager.jQuery, Version=3.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.3.5.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
<Reference Include="AspNet.ScriptManager.jQuery, Version=3.7.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.3.7.1\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
</Reference>
<Reference Include="AspNet.ScriptManager.jQuery.UI.Combined, Version=1.12.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.UI.Combined.1.12.1\lib\net45\AspNet.ScriptManager.jQuery.UI.Combined.dll</HintPath>
</Reference>
<Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
<Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
<HintPath>..\packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
</Reference>
<Reference Include="DnsClient, Version=1.3.2.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.3.2\lib\net45\DnsClient.dll</HintPath>
<Reference Include="DnsClient, Version=1.8.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.8.0\lib\netstandard2.0\DnsClient.dll</HintPath>
</Reference>
<Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.2.0.246, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.2.0\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
<Reference Include="IronSnappy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b1d4b1dc83bdcf31, processorArchitecture=MSIL">
<HintPath>..\packages\IronSnappy.1.3.1\lib\netstandard2.0\IronSnappy.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.2.0.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.11.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.11.2\lib\net452\MongoDB.Bson.dll</HintPath>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.11.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.11.2\lib\net452\MongoDB.Driver.dll</HintPath>
<Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.11.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.11.2\lib\net452\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.5.0.4\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
<Reference Include="Microsoft.Win32.Registry, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Win32.Registry.5.0.0\lib\net461\Microsoft.Win32.Registry.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.17.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.5\lib\net45\NLog.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.17.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.17.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.5.4\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.3.3\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="PdfSharp, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll</HintPath>
@@ -108,42 +117,45 @@
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.26.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.26.0\lib\net46\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="Snappy.NET, Version=1.1.1.8, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
<Reference Include="SharpCompress, Version=0.38.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.38.0\lib\net462\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.8.0\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.0.2010.745\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.4.2509.1715\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="SteamWare.Logger, Version=5.0.2010.745, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.0.2010.745\lib\net462\SteamWare.Logger.dll</HintPath>
<Reference Include="SteamWare.Logger, Version=5.4.2509.1715, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.4.2509.1715\lib\net462\SteamWare.Logger.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.DirectoryServices" />
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
</Reference>
<Reference Include="System.IO.Pipelines, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.4.7.2\lib\net461\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
</Reference>
@@ -151,30 +163,45 @@
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Channels, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.7.1\lib\net461\System.Threading.Channels.dll</HintPath>
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
@@ -190,10 +217,6 @@
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ScriptManager.MSAjax">
<HintPath>..\packages\Microsoft.AspNet.ScriptManager.MSAjax.5.0.0\lib\net45\Microsoft.ScriptManager.MSAjax.dll</HintPath>
</Reference>
@@ -219,6 +242,10 @@
<Reference Include="Microsoft.AspNet.FriendlyUrls">
<HintPath>..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="ZstdSharp, Version=0.8.1.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
<HintPath>..\packages\ZstdSharp.Port.0.8.1\lib\net462\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="anagArticoli.aspx" />
@@ -229,15 +256,26 @@
<Content Include="App_Readme\README_SteamWare.txt" />
<Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
<Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
<Content Include="Azienda.aspx" />
<Content Include="Barcode.aspx" />
<Content Include="BCode.aspx" />
<Content Include="calendChiusura.aspx" />
<Content Include="Content\bootstrap-grid.css" />
<Content Include="Content\bootstrap-grid.min.css" />
<Content Include="Content\bootstrap-grid.rtl.css" />
<Content Include="Content\bootstrap-grid.rtl.min.css" />
<Content Include="Content\bootstrap-reboot.css" />
<Content Include="Content\bootstrap-reboot.min.css" />
<Content Include="Content\bootstrap-reboot.rtl.css" />
<Content Include="Content\bootstrap-reboot.rtl.min.css" />
<Content Include="Content\bootstrap-utilities.css" />
<Content Include="Content\bootstrap-utilities.min.css" />
<Content Include="Content\bootstrap-utilities.rtl.css" />
<Content Include="Content\bootstrap-utilities.rtl.min.css" />
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\bootstrap.rtl.css" />
<Content Include="Content\bootstrap.rtl.min.css" />
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\fonts.css">
@@ -299,6 +337,8 @@
<Content Include="CTrackBCode.aspx" />
<Content Include="DataImport.aspx" />
<Content Include="Default.aspx" />
<Content Include="example-config-table.txt" />
<Content Include="example-favicon.ico" />
<Content Include="ExportPdf.aspx" />
<Content Include="favicon.ico" />
<Content Include="fonts\fontawesome-webfont.svg" />
@@ -390,6 +430,7 @@
<Content Include="help\syntaxhighlight.css" />
<Content Include="help\table_of_contents.html" />
<Content Include="HwSwInfo.aspx" />
<Content Include="ImageArchive.aspx" />
<Content Include="images\apply.png" />
<Content Include="images\apply_l.png" />
<Content Include="images\apply_m.png" />
@@ -433,6 +474,26 @@
<Content Include="images\ProgressBar.gif" />
<Content Include="images\rosso.png" />
<Content Include="images\sfondo.png" />
<Content Include="images\ST_img\60022-01.jpeg" />
<Content Include="images\ST_img\60088-01.jpeg" />
<Content Include="images\ST_img\600979-01.jpeg" />
<Content Include="images\ST_img\60144-01.jpeg" />
<Content Include="images\ST_img\60144-02.jpeg" />
<Content Include="images\ST_img\60145-01.jpeg" />
<Content Include="images\ST_img\60145-02.jpeg" />
<Content Include="images\ST_img\60148-01.jpeg" />
<Content Include="images\ST_img\60156-01.jpeg" />
<Content Include="images\ST_img\60156-02.jpeg" />
<Content Include="images\ST_img\60159-01.jpeg" />
<Content Include="images\ST_img\60210-01.jpeg" />
<Content Include="images\ST_img\60210-02.jpeg" />
<Content Include="images\ST_img\60211-01.jpeg" />
<Content Include="images\ST_img\60211-02.jpeg" />
<Content Include="images\ST_img\60220-01.jpeg" />
<Content Include="images\ST_img\60220-02.jpeg" />
<Content Include="images\ST_img\Steamware.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="images\titoloCruscotto.png" />
<Content Include="images\verde.png" />
<Content Include="images\view.gif" />
@@ -442,21 +503,21 @@
<Content Include="images\view_m.png" />
<Content Include="images\view_s.gif" />
<Content Include="images\view_s.png" />
<Content Include="libzstd.dll" />
<Content Include="login.aspx" />
<Content Include="menu.aspx" />
<Content Include="mongocrypt.dll" />
<Content Include="Planner.aspx" />
<Content Include="Properties\PublishProfiles\IIS01.pubxml.user" />
<Content Include="Properties\PublishProfiles\IIS02.pubxml.user" />
<Content Include="Properties\PublishProfiles\IIS03.pubxml.user" />
<Content Include="Resources\ChangeLog.html" />
<Content Include="Resources\logoSteamware.png" />
<Content Include="Resources\manifest.xml" />
<Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Content\fonts.less" />
<Content Include="Content\Style.less" />
<Content Include="Scripts\bootstrap.bundle.js" />
<Content Include="Scripts\bootstrap.bundle.min.js" />
<Content Include="Scripts\bootstrap.esm.js" />
<Content Include="Scripts\bootstrap.esm.min.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
@@ -467,14 +528,36 @@
<Content Include="Scripts\esm\popper.js.map" />
<Content Include="Scripts\esm\popper-utils.min.js.map" />
<Content Include="Scripts\esm\popper-utils.js.map" />
<Content Include="example-NLog.config" />
<Content Include="example-app.config" />
<Content Include="FileUpload\.placeHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include=".editorconfig" />
<Content Include="Core\Compression\Zstandard\lib\osx\libzstd.dylib" />
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.esm.min.js.map" />
<Content Include="Scripts\bootstrap.esm.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
<Content Include="Scripts\bootstrap.bundle.js.map" />
<Content Include="Content\bootstrap.rtl.min.css.map" />
<Content Include="Content\bootstrap.rtl.css.map" />
<Content Include="Content\bootstrap.min.css.map" />
<Content Include="Content\bootstrap.css.map" />
<Content Include="Content\bootstrap-utilities.rtl.min.css.map" />
<Content Include="Content\bootstrap-utilities.rtl.css.map" />
<Content Include="Content\bootstrap-utilities.min.css.map" />
<Content Include="Content\bootstrap-utilities.css.map" />
<Content Include="Content\bootstrap-reboot.rtl.min.css.map" />
<Content Include="Content\bootstrap-reboot.rtl.css.map" />
<Content Include="Content\bootstrap-reboot.min.css.map" />
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.rtl.min.css.map" />
<Content Include="Content\bootstrap-grid.rtl.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
@@ -482,11 +565,11 @@
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.slim.js" />
<None Include="Scripts\jquery-3.5.1.intellisense.js" />
<Content Include="Scripts\jquery-3.5.1.js" />
<Content Include="Scripts\jquery-3.5.1.min.js" />
<Content Include="Scripts\jquery-3.5.1.slim.js" />
<Content Include="Scripts\jquery-3.5.1.slim.min.js" />
<None Include="Scripts\jquery-3.7.1.intellisense.js" />
<Content Include="Scripts\jquery-3.7.1.js" />
<Content Include="Scripts\jquery-3.7.1.min.js" />
<Content Include="Scripts\jquery-3.7.1.slim.js" />
<Content Include="Scripts\jquery-3.7.1.slim.min.js" />
<Content Include="Scripts\popper-utils.js" />
<Content Include="Scripts\popper-utils.min.js" />
<Content Include="Scripts\popper.js" />
@@ -558,14 +641,34 @@
<Content Include="Scripts\umd\popper-utils.min.js" />
<Content Include="Scripts\umd\popper.js" />
<Content Include="Scripts\umd\popper.min.js" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="StoricoTC.aspx" />
<Content Include="TechSheetMan.aspx" />
<Content Include="test.aspx" />
<Content Include="testUtente.aspx" />
<Content Include="unauthorized.aspx" />
<Content Include="Vocabolario.aspx" />
<Content Include="WebUserControls\cmp_CompanySelector.ascx" />
<Content Include="WebUserControls\cmp_fileUpload.ascx" />
<Content Include="WebUserControls\cmp_HwSwInfo.ascx" />
<Content Include="WebUserControls\cmp_ImageArchive.ascx" />
<Content Include="WebUserControls\cmp_lemmiVocab.ascx" />
<Content Include="WebUserControls\cmp_numRow.ascx" />
<Content Include="WebUserControls\cmp_planSchedule.ascx" />
<Content Include="WebUserControls\cmp_planStats_Art.ascx" />
<Content Include="WebUserControls\cmp_planStats_Cli.ascx" />
<Content Include="WebUserControls\cmp_planStats_Fasi.ascx" />
<Content Include="WebUserControls\cmp_planStats_Mac.ascx" />
<Content Include="WebUserControls\cmp_PODL_OUT.ascx" />
<Content Include="WebUserControls\cmp_ricercaGenerica.ascx" />
<Content Include="WebUserControls\cmp_righePag.ascx" />
<Content Include="WebUserControls\cmp_ST_detail.ascx" />
<Content Include="WebUserControls\cmp_ST_objView.ascx" />
<Content Include="WebUserControls\cmp_ST_preview.ascx" />
<Content Include="WebUserControls\cmp_TechSheetArt.ascx" />
<Content Include="WebUserControls\cmp_TechSheetArtAddNew.ascx" />
<Content Include="WebUserControls\cmp_TechSheetDetail.ascx" />
<Content Include="WebUserControls\cmp_TechSheetMan.ascx" />
<Content Include="WebUserControls\cmp_vocabolario.ascx" />
<Content Include="WebUserControls\mod_anagArticoli.ascx" />
<Content Include="WebUserControls\mod_aperturaImpianti.ascx" />
<Content Include="WebUserControls\mod_approvazioneODL.ascx" />
@@ -578,7 +681,6 @@
<Content Include="WebUserControls\mod_gestioneODL.ascx" />
<Content Include="WebUserControls\mod_gestKIT.ascx" />
<Content Include="WebUserControls\mod_gestPromODL.ascx" />
<Content Include="WebUserControls\mod_gestPromODL_OUT.ascx" />
<Content Include="WebUserControls\mod_login.ascx" />
<Content Include="WebUserControls\mod_main_help.ascx" />
<Content Include="WebUserControls\mod_menuBottom.ascx" />
@@ -588,8 +690,8 @@
<Content Include="WebUserControls\mod_newOdl.ascx" />
<Content Include="WebUserControls\mod_newPromessaODL.ascx" />
<Content Include="WebUserControls\mod_pageTitleAndSearch.ascx" />
<Content Include="WebUserControls\mod_planCreate.ascx" />
<Content Include="WebUserControls\mod_planStats.ascx" />
<Content Include="WebUserControls\cmp_planApprove.ascx" />
<Content Include="WebUserControls\cmp_planStats.ascx" />
<Content Include="WebUserControls\mod_ricercaGenerica.ascx" />
<Content Include="WebUserControls\mod_storicoTC.ascx" />
<Content Include="WebUserControls\mod_unauthorized.ascx" />
@@ -610,7 +712,7 @@
<Content Include="images\semafori.xcf" />
<Content Include="logs\PlaceHolder.file" />
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\IIS02.pubxml" />
<None Include="Properties\PublishProfiles\IIS03.pubxml" />
<Content Include="Scripts\jquery-ui-1.12.1.js" />
<Content Include="Scripts\jquery-ui-1.12.1.min.js" />
<Content Include="Scripts\modernizr-2.8.3.js" />
@@ -677,6 +779,13 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\MP_Startup.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="Azienda.aspx.cs">
<DependentUpon>Azienda.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Azienda.aspx.designer.cs">
<DependentUpon>Azienda.aspx</DependentUpon>
</Compile>
<Compile Include="Barcode.aspx.cs">
<DependentUpon>Barcode.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -777,6 +886,13 @@
<Compile Include="HwSwInfo.aspx.designer.cs">
<DependentUpon>HwSwInfo.aspx</DependentUpon>
</Compile>
<Compile Include="ImageArchive.aspx.cs">
<DependentUpon>ImageArchive.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ImageArchive.aspx.designer.cs">
<DependentUpon>ImageArchive.aspx</DependentUpon>
</Compile>
<Compile Include="login.aspx.cs">
<DependentUpon>login.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -806,6 +922,13 @@
<Compile Include="StoricoTC.aspx.designer.cs">
<DependentUpon>StoricoTC.aspx</DependentUpon>
</Compile>
<Compile Include="TechSheetMan.aspx.cs">
<DependentUpon>TechSheetMan.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="TechSheetMan.aspx.designer.cs">
<DependentUpon>TechSheetMan.aspx</DependentUpon>
</Compile>
<Compile Include="test.aspx.cs">
<DependentUpon>test.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -820,6 +943,13 @@
<Compile Include="testUtente.aspx.designer.cs">
<DependentUpon>testUtente.aspx</DependentUpon>
</Compile>
<Compile Include="Vocabolario.aspx.cs">
<DependentUpon>Vocabolario.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Vocabolario.aspx.designer.cs">
<DependentUpon>Vocabolario.aspx</DependentUpon>
</Compile>
<Compile Include="WebMasterPages\AjaxSimple.master.cs">
<DependentUpon>AjaxSimple.master</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -848,6 +978,20 @@
<Compile Include="WebMasterPages\MoonPro_noAjax.master.designer.cs">
<DependentUpon>MoonPro_noAjax.master</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_CompanySelector.ascx.cs">
<DependentUpon>cmp_CompanySelector.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_CompanySelector.ascx.designer.cs">
<DependentUpon>cmp_CompanySelector.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_fileUpload.ascx.cs">
<DependentUpon>cmp_fileUpload.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_fileUpload.ascx.designer.cs">
<DependentUpon>cmp_fileUpload.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_HwSwInfo.ascx.cs">
<DependentUpon>cmp_HwSwInfo.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -855,12 +999,139 @@
<Compile Include="WebUserControls\cmp_HwSwInfo.ascx.designer.cs">
<DependentUpon>cmp_HwSwInfo.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ImageArchive.ascx.cs">
<DependentUpon>cmp_ImageArchive.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ImageArchive.ascx.designer.cs">
<DependentUpon>cmp_ImageArchive.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_lemmiVocab.ascx.cs">
<DependentUpon>cmp_lemmiVocab.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_lemmiVocab.ascx.designer.cs">
<DependentUpon>cmp_lemmiVocab.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_numRow.ascx.cs">
<DependentUpon>cmp_numRow.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_numRow.ascx.designer.cs">
<DependentUpon>cmp_numRow.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_planSchedule.ascx.cs">
<DependentUpon>cmp_planSchedule.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_planSchedule.ascx.designer.cs">
<DependentUpon>cmp_planSchedule.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Art.ascx.cs">
<DependentUpon>cmp_planStats_Art.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Art.ascx.designer.cs">
<DependentUpon>cmp_planStats_Art.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Cli.ascx.cs">
<DependentUpon>cmp_planStats_Cli.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Cli.ascx.designer.cs">
<DependentUpon>cmp_planStats_Cli.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Fasi.ascx.cs">
<DependentUpon>cmp_planStats_Fasi.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Fasi.ascx.designer.cs">
<DependentUpon>cmp_planStats_Fasi.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Mac.ascx.cs">
<DependentUpon>cmp_planStats_Mac.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_planStats_Mac.ascx.designer.cs">
<DependentUpon>cmp_planStats_Mac.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_PODL_OUT.ascx.cs">
<DependentUpon>cmp_PODL_OUT.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_PODL_OUT.ascx.designer.cs">
<DependentUpon>cmp_PODL_OUT.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ricercaGenerica.ascx.cs">
<DependentUpon>cmp_ricercaGenerica.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ricercaGenerica.ascx.designer.cs">
<DependentUpon>cmp_ricercaGenerica.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_righePag.ascx.cs">
<DependentUpon>cmp_righePag.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_righePag.ascx.designer.cs">
<DependentUpon>cmp_righePag.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ST_detail.ascx.cs">
<DependentUpon>cmp_ST_detail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ST_detail.ascx.designer.cs">
<DependentUpon>cmp_ST_detail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ST_objView.ascx.cs">
<DependentUpon>cmp_ST_objView.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ST_objView.ascx.designer.cs">
<DependentUpon>cmp_ST_objView.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ST_preview.ascx.cs">
<DependentUpon>cmp_ST_preview.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ST_preview.ascx.designer.cs">
<DependentUpon>cmp_ST_preview.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetArt.ascx.cs">
<DependentUpon>cmp_TechSheetArt.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetArt.ascx.designer.cs">
<DependentUpon>cmp_TechSheetArt.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetArtAddNew.ascx.cs">
<DependentUpon>cmp_TechSheetArtAddNew.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetArtAddNew.ascx.designer.cs">
<DependentUpon>cmp_TechSheetArtAddNew.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetDetail.ascx.cs">
<DependentUpon>cmp_TechSheetDetail.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetDetail.ascx.designer.cs">
<DependentUpon>cmp_TechSheetDetail.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetMan.ascx.cs">
<DependentUpon>cmp_TechSheetMan.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_TechSheetMan.ascx.designer.cs">
<DependentUpon>cmp_TechSheetMan.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_vocabolario.ascx.cs">
<DependentUpon>cmp_vocabolario.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_vocabolario.ascx.designer.cs">
<DependentUpon>cmp_vocabolario.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_anagArticoli.ascx.cs">
<DependentUpon>mod_anagArticoli.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -870,6 +1141,7 @@
</Compile>
<Compile Include="WebUserControls\mod_aperturaImpianti.ascx.cs">
<DependentUpon>mod_aperturaImpianti.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_aperturaImpianti.ascx.designer.cs">
<DependentUpon>mod_aperturaImpianti.ascx</DependentUpon>
@@ -897,6 +1169,7 @@
</Compile>
<Compile Include="WebUserControls\mod_calChiusura.ascx.cs">
<DependentUpon>mod_calChiusura.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_calChiusura.ascx.designer.cs">
<DependentUpon>mod_calChiusura.ascx</DependentUpon>
@@ -943,21 +1216,16 @@
<Compile Include="WebUserControls\mod_gestPromODL.ascx.designer.cs">
<DependentUpon>mod_gestPromODL.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_gestPromODL_OUT.ascx.cs">
<DependentUpon>mod_gestPromODL_OUT.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_gestPromODL_OUT.ascx.designer.cs">
<DependentUpon>mod_gestPromODL_OUT.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_login.ascx.cs">
<DependentUpon>mod_login.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_login.ascx.designer.cs">
<DependentUpon>mod_login.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_main_help.ascx.cs">
<DependentUpon>mod_main_help.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_main_help.ascx.designer.cs">
<DependentUpon>mod_main_help.ascx</DependentUpon>
@@ -971,6 +1239,7 @@
</Compile>
<Compile Include="WebUserControls\mod_menuSx.ascx.cs">
<DependentUpon>mod_menuSx.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_menuSx.ascx.designer.cs">
<DependentUpon>mod_menuSx.ascx</DependentUpon>
@@ -1005,24 +1274,28 @@
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_pageTitleAndSearch.ascx.designer.cs">
<DependentUpon>mod_pageTitleAndSearch.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_planCreate.ascx.cs">
<DependentUpon>mod_planCreate.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_planApprove.ascx.cs">
<DependentUpon>cmp_planApprove.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_planCreate.ascx.designer.cs">
<DependentUpon>mod_planCreate.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_planApprove.ascx.designer.cs">
<DependentUpon>cmp_planApprove.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_planStats.ascx.cs">
<DependentUpon>mod_planStats.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_planStats.ascx.cs">
<DependentUpon>cmp_planStats.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_planStats.ascx.designer.cs">
<DependentUpon>mod_planStats.ascx</DependentUpon>
<Compile Include="WebUserControls\cmp_planStats.ascx.designer.cs">
<DependentUpon>cmp_planStats.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_ricercaGenerica.ascx.cs">
<DependentUpon>mod_ricercaGenerica.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_ricercaGenerica.ascx.designer.cs">
<DependentUpon>mod_ricercaGenerica.ascx</DependentUpon>
@@ -1064,17 +1337,16 @@
<Content Include="Scripts\popper.js.map" />
<Content Include="Scripts\popper-utils.min.js.map" />
<Content Include="Scripts\popper-utils.js.map" />
<Content Include="Scripts\jquery-3.5.1.slim.min.map" />
<Content Include="Scripts\jquery-3.5.1.min.map" />
<Content Include="Web.PROD.Jetco.config" />
<Content Include="Web.DEV.config" />
<Content Include="Scripts\jquery-3.7.1.slim.min.map" />
<Content Include="Scripts\jquery-3.7.1.min.map" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.IIS01.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.IIS02.config">
<DependentUpon>Web.config</DependentUpon>
</None>
<None Include="Web.Prod.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1098,40 +1370,14 @@
<ItemGroup>
<TypeScriptCompile Include="Scripts\index.d.ts" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Prod|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'IIS01|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'IIS02|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets')" />
<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />
@@ -1144,7 +1390,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>5332</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:5332/</IISUrl>
<IISUrl>http://localhost:5333/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
@@ -1160,11 +1406,11 @@
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.11.2\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.11.2\build\MongoDB.Driver.Core.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets'))" />
</Target>
<Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.11.2\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.11.2\build\MongoDB.Driver.Core.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.5.4\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.17.0\build\MongoDB.Driver.Core.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
+6 -29
View File
@@ -1,37 +1,14 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Planner.aspx.cs" Inherits="MP_ADM.Planner" %>
<%@ Register Src="~/WebUserControls/mod_barcode.ascx" TagPrefix="uc1" TagName="mod_barcode" %>
<%@ Register Src="~/WebUserControls/mod_planStats.ascx" TagPrefix="uc1" TagName="mod_planStats" %>
<%@ Register Src="~/WebUserControls/mod_planCreate.ascx" TagPrefix="uc1" TagName="mod_planCreate" %>
<%@ Register Src="~/WebUserControls/mod_gestPromODL_OUT.ascx" TagPrefix="uc1" TagName="mod_gestPromODL_OUT" %>
<%@ Register Src="~/WebUserControls/cmp_planStats.ascx" TagPrefix="uc1" TagName="cmp_planStats" %>
<%@ Register Src="~/WebUserControls/cmp_planApprove.ascx" TagPrefix="uc1" TagName="cmp_planApprove" %>
<%@ Register Src="~/WebUserControls/cmp_planSchedule.ascx" TagPrefix="uc1" TagName="cmp_planSchedule" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<asp:Label runat="server" ID="lblDataImportOut" CssClass="text-danger" />
<div runat="server" id="divContent">
<uc1:mod_planStats runat="server" ID="mod_planStats" />
<uc1:mod_planCreate runat="server" ID="mod_planCreate" />
<div class="card">
<div class="card-header bg-success text-light">
<div class="d-flex justify-content-between">
<div class="p-0 align-self-center">
<h5>Pianificazione</h5>
</div>
<div class="p-0" style="font-size: 1.6em;">
</div>
<div class="p-0 align-self-center">
<asp:LinkButton runat="server" ID="lbtToggle" OnClick="lbtToggle_Click" CssClass="btn btn-light"><i class="fa fa-chevron-up" aria-hidden="true" runat="server" id="tgIcon"></i></asp:LinkButton>
</div>
</div>
</div>
<div class="card-body p-1" runat="server" id="divPromOUT">
<%-- <br />
rivedere il discorso dei FREEPASS autogenerati... x filtrare x TIPO creazione
<br />
ordinare SEMPRE x priorità ASC (FIFO) e indicarlo!!!
<br />
togliere filtri da header e/o gestione toggle e/o nascondere creazione promessa?--%>
<uc1:mod_gestPromODL_OUT runat="server" ID="mod_gestPromODL_OUT" />
</div>
</div>
<uc1:cmp_planStats runat="server" ID="cmp_planStats" />
<uc1:cmp_planApprove runat="server" ID="cmp_planApprove" />
<uc1:cmp_planSchedule runat="server" id="cmp_planSchedule" />
</div>
</asp:Content>
+73 -89
View File
@@ -5,114 +5,98 @@ namespace MP_ADM
{
public partial class Planner : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
toggleVisibility();
}
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
mod_planStats.eh_reset += Mod_planStats_eh_reset;
mod_planStats.eh_selVal += Mod_planStats_eh_selVal;
mod_planCreate.eh_ucev += Mod_planCreate_eh_ucev;
}
private void Mod_planCreate_eh_ucev(object sender, EventArgs e)
{
// se trovo evento select/reset mostro/nascondo dettagli...
ucEvent evento = (ucEvent)e;
switch (evento.tipoEvento)
{
case ucEvType.ReqUpdateParent:
mod_planStats.doReset();
mod_gestPromODL_OUT.resetSelezione();
break;
default:
break;
}
}
protected void lbtToggle_Click(object sender, EventArgs e)
{
toggleVisibility();
}
private void toggleVisibility()
{
divPromOUT.Visible = !divPromOUT.Visible;
tgIcon.Attributes["class"] = divPromOUT.Visible ? "fa fa-chevron-up" : "fa fa-chevron-down";
}
private void Mod_planStats_eh_selVal(object sender, EventArgs e)
{
fixSelStat();
}
private void Mod_planStats_eh_reset(object sender, EventArgs e)
{
fixSelStat();
}
protected void fixSelStat()
{
mod_planCreate.CodGruppo = mod_planStats.CodGruppo;
mod_planCreate.IdxMacchina = mod_planStats.IdxMacchina;
mod_planCreate.CodArticolo = mod_planStats.CodArticolo;
mod_planCreate.doUpdate();
}
#region Private Methods
private void checkEnabled()
{
bool optPar = memLayer.ML.CRB("OptAdmKitEnabled");
// FIXME TODO
// !!! FARE!!! vera verifica licenza ES3 in AnagKeyValue...
bool optPar = memLayer.ML.CRB("OptAdmPlanEnabled");
divContent.Visible = optPar;
lblDataImportOut.Visible = !optPar;
string messaggio = "";
if (!optPar)
{
messaggio = "Attenzione: Gestione KIT disabilitata";
messaggio = "Attenzione: Gestione PLANNER disabilitata";
lblDataImportOut.Text = messaggio;
}
}
private void Mod_gestKIT_eh_selKit(object sender, EventArgs e)
private void checkFixPromIn()
{
#if false
// invio ultimo kit creato a barcode...
mod_barcode.BCodeVal = mod_gestKIT.lastKitMade;
mod_barcode.processInput();
#endif
// chiama stored x riallineamento prom IN che fossero pending (-10) x chiudere SE processate tutte le prom a valle (promOut con idxODL > 0)
DataLayerObj.taPromIn.updProc();
}
private void Mod_barcode_eh_dataRead(object sender, EventArgs e)
private void Cmp_planApprove_eh_nuovoValore(object sender, EventArgs e)
{
#if false
// verifico input su KIT x lettura "grezza"
string rawInput = mod_barcode.rawInput;
mod_gestKIT.lastInput = rawInput;
mod_gestKIT.doUpdate();
#endif
cmp_planStats.doUpdate();
cmp_planSchedule.doUpdate();
}
private void Mod_barcode_eh_comandoRegistrato(object sender, EventArgs e)
private void Cmp_planApprove_eh_resetSelezione(object sender, EventArgs e)
{
#if false
// verifico input su KIT x comando completo
string BCodeVal = mod_barcode.BCodeVal;
// se è un ORDINE... procedo!
if (BCodeVal.IndexOf("OPR") == 0)
{
// aggiungo ordine...
mod_gestKIT.addOrdArt(mod_barcode.codOrd, mod_barcode.codArt, mod_barcode.descArt, mod_barcode.qta);
mod_gestKIT.lastInput = "";
}
else
{
mod_gestKIT.lastInput = mod_barcode.BCodeVal;
}
mod_gestKIT.doUpdate();
#endif
cmp_planStats.doReset();
cmp_planSchedule.doReset();
}
private void Cmp_planApprove_eh_selValore(object sender, EventArgs e)
{
cmp_planStats.doReset();
cmp_planSchedule.doReset();
}
private void cmp_planSchedule_eh_nuovoValore(object sender, EventArgs e)
{
cmp_planStats.doUpdate();
cmp_planApprove.doUpdate();
}
private void cmp_planStats_eh_reset(object sender, EventArgs e)
{
doRefreshChild();
}
private void cmp_planStats_eh_selVal(object sender, EventArgs e)
{
doRefreshChild();
}
#endregion Private Methods
#region Protected Methods
protected void doRefreshChild()
{
cmp_planApprove.CodArticolo = cmp_planStats.CodArticolo;
cmp_planApprove.CodCliente = cmp_planStats.CodCliente;
cmp_planApprove.CodGruppo = cmp_planStats.CodFase;
cmp_planApprove.IdxMacchina = cmp_planStats.IdxMacchina;
cmp_planApprove.doUpdate();
cmp_planSchedule.CodArticolo = cmp_planStats.CodArticolo;
cmp_planSchedule.CodCliente = cmp_planStats.CodCliente;
cmp_planSchedule.CodFase = cmp_planStats.CodFase;
cmp_planSchedule.IdxMacchina = cmp_planStats.IdxMacchina;
cmp_planSchedule.doUpdate();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
checkFixPromIn();
}
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmKit_CodPre");
cmp_planStats.eh_reset += cmp_planStats_eh_reset;
cmp_planStats.eh_selVal += cmp_planStats_eh_selVal;
cmp_planApprove.eh_resetSelezione += Cmp_planApprove_eh_resetSelezione;
cmp_planApprove.eh_selValore += Cmp_planApprove_eh_selValore;
cmp_planApprove.eh_nuovoValore += Cmp_planApprove_eh_nuovoValore;
cmp_planSchedule.eh_nuovoValore += cmp_planSchedule_eh_nuovoValore;
}
#endregion Protected Methods
}
}
+17 -42
View File
@@ -7,11 +7,13 @@
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MP_ADM {
public partial class Planner {
namespace MP_ADM
{
public partial class Planner
{
/// <summary>
/// Controllo lblDataImportOut.
/// </summary>
@@ -20,7 +22,7 @@ namespace MP_ADM {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblDataImportOut;
/// <summary>
/// Controllo divContent.
/// </summary>
@@ -29,59 +31,32 @@ namespace MP_ADM {
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divContent;
/// <summary>
/// Controllo mod_planStats.
/// Controllo cmp_planStats.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_planStats mod_planStats;
protected global::MP_ADM.WebUserControls.cmp_planStats cmp_planStats;
/// <summary>
/// Controllo mod_planCreate.
/// Controllo cmp_planApprove.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_planCreate mod_planCreate;
protected global::MP_ADM.WebUserControls.cmp_planApprove cmp_planApprove;
/// <summary>
/// Controllo lbtToggle.
/// Controllo cmp_planSchedule.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtToggle;
/// <summary>
/// Controllo tgIcon.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl tgIcon;
/// <summary>
/// Controllo divPromOUT.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divPromOUT;
/// <summary>
/// Controllo mod_gestPromODL_OUT.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MP_ADM.WebUserControls.mod_gestPromODL_OUT mod_gestPromODL_OUT;
protected global::MP_ADM.WebUserControls.cmp_planSchedule cmp_planSchedule;
}
}
+10 -9
View File
@@ -6,18 +6,18 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>IIS01</LastUsedBuildConfiguration>
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<ExcludeApp_Data>True</ExcludeApp_Data>
<ExcludeApp_Data>true</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MP/ADM</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<_SavePWD>true</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MapoDb.Properties.Settings.MoonProConnectionString" Order="1" Enabled="False">
@@ -42,12 +42,13 @@ by editing this MSBuild file. In order to learn more about this please visit htt
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>
<DebugSymbols>false</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<EnableMsDeployAppOffline>false</EnableMsDeployAppOffline>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.MoonProConnectionString-Web.config Connection String">
@@ -1,60 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>IIS02</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MP/ADM</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MapoDb.Properties.Settings.MoonProConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MapoDb.Properties.Settings.MoonProConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="MoonProConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MoonProConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.MoonProConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MoonProConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
</ItemGroup>
</Project>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAACMkdGo+hmg4NN9+mYykXhBAAAAAASAAACgAAAAEAAAABZoq0sbipzoj0L+D0u6cnAYAAAAk5QxRasgkE8hUBg48tIERaacHxAsNyLGFAAAACS/a71mOhgsnxM59u6tWZfzwPZJ</EncryptedPassword>
</PropertyGroup>
</Project>
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>iis03</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<ExcludeApp_Data>true</ExcludeApp_Data>
<MSDeployServiceURL>https://iis03.egalware.com:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/MP/ADM</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>false</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>true</EnableMSDeployBackup>
<UserName>jenkins</UserName>
<_SavePWD>true</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="MapoDb.Properties.Settings.MoonProConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MapoDb.Properties.Settings.MoonProConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="MoonProConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MoonProConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" Order="3" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MapoDb.Properties.Settings.MoonPro_IS_ConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" Order="4" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MapoDb.Properties.Settings.MoonPro_ES3ConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="MapoDb.Properties.Settings.C_TRACKConnectionString" Order="5" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\MapoDb.Properties.Settings.C_TRACKConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="ErrorLog" Order="6" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\ErrorLog_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
<LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<PrecompileBeforePublish>true</PrecompileBeforePublish>
<EnableUpdateable>true</EnableUpdateable>
<DebugSymbols>false</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<EnableMsDeployAppOffline>false</EnableMsDeployAppOffline>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)ErrorLog-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.C_TRACKConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.MoonProConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.MoonPro_ES3ConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)MapoDb.Properties.Settings.MoonPro_IS_ConnectionString-Web.config Connection String" />
<MSDeployParameterValue Include="$(DeployParameterPrefix)MoonProConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
</ItemGroup>
</Project>
@@ -6,6 +6,8 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAAH0adXzrANk+QkSQiwkrZoAAAAAACAAAAAAADZgAAwAAAABAAAACm/70mx911cvyadKgQUsL2AAAAAASAAACgAAAAEAAAAE0QB1Sufr8PzwtgU+f9mQ8YAAAAcvQ7HQmR1/Q4aJJmdLjzgffjmwtEDQoEFAAAANrjCA7dCcGbgY73YokYwxioG5ri</EncryptedPassword>
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAANAh+Q4GwYESjv9I3Vz/gKgAAAAACAAAAAAADZgAAwAAAABAAAAA+zJ9KFSqNqLcpUYaou+uJAAAAAASAAACgAAAAEAAAAFdkm2Mz0w+kHhOazNOvL2AYAAAA2gpmttLImZHN08eupleXe6qD6yvZ5l2aFAAAAO2uZXLwo42Vh/kN3jsgWJeV8aCw</EncryptedPassword>
<History>True|2024-03-22T08:46:21.0385587Z;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
+2 -2
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.0.0</version>
<url>http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
<changelog>http://seriate.steamware.net:8083/SWS/MAPO/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html</changelog>
<url>https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/{{PACKNAME}}/{{BRANCHNAME}}/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
+5720 -6429
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+4447
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+4046 -3962
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
+3 -3
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More