Compare commits

...

554 Commits

Author SHA1 Message Date
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
1208 changed files with 233609 additions and 58773 deletions
+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>
Vendored
+107 -80
View File
@@ -5,6 +5,7 @@ pipeline {
EMAIL_RECIPIENTS = 'samuele@steamware.net'
enableIIS01 = 'Y'
enableIIS02 = 'Y'
singleProj ='ADM,IO,LAND,MAG,MON,SITE,TAB'
}
stages {
stage('Checkout') {
@@ -12,11 +13,8 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1313']) {
// 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'
}
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
script {
currentBuild.displayName = "${env.versionNumber}"
@@ -43,25 +41,32 @@ pipeline {
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"
ALL: {
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-ADM/MP-ADM.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-IO/MP-IO.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-SITE/MP-SITE.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
// },
// LAND_MON_TAB: {
// sleep 1
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-LAND/MP-LAND.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-MON/MP-MON.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-TAB/MP-TAB.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-MAG/MP-MAG.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
},
failFast: false)
}
}
else if ( env.singleProj.contains(env.BRANCH_NAME) ) {
parallel (
SINGLE: {
bat "\"${tool 'MSBuild-16.0'}\" /p:m=8 MP-${env.BRANCH_NAME}/MP-${env.BRANCH_NAME}.csproj -target:Build /p:Configuration=Release /p:Platform=\"Any CPU\" /p:OutputPath=bin/ /verbosity:minimal /m"
},
failFast: false)
}
else {
echo 'Niente x Build (limitata a develop)...'
}
@@ -82,55 +87,60 @@ pipeline {
/* DEPLOY condizionale: master (Ufficio Seriate) / demo_ovh (Demo Online) */
if (env.BRANCH_NAME == "master") {
parallel (
ADM_IO: {
ALL: {
sleep 2
if(env.enableIIS02 == "Y")
{
// ADM
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// IO
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// SITE
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// }
// },
// LAND_MON_TAB: {
// sleep 0
// if(env.enableIIS02 == "Y")
// {
//LAND
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// MON
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// TAB
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// MAG
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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-MAG/MP-MAG.csproj /p:verbosity=minimal"
}
},
failFast: false)
}
else if (env.BRANCH_NAME == "beta") {
parallel (
ALL: {
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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// 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")
{
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// SITE
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// }
// },
// LAND_MON_TAB: {
// sleep 0
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// MAG
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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-MAG/MP-MAG.csproj /p:verbosity=minimal"
}
},
failFast: false)
@@ -142,7 +152,7 @@ pipeline {
// 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"
bat "\"${tool 'MSBuild-16.0'}\" MapoSDK\\MapoSDK.csproj -target:Build /p:Configuration=${env.config} /p:Platform=\"Any CPU\" /p:OutputPath=bin/${env.config} /verbosity:minimal /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}"
@@ -151,6 +161,13 @@ pipeline {
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 if ( env.singleProj.contains(env.BRANCH_NAME) ) {
parallel (
SINGLE: {
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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-${env.BRANCH_NAME}/MP-${env.BRANCH_NAME}.csproj /p:verbosity=minimal"
},
failFast: false)
}
else {
echo 'Nothing to deploy...'
}
@@ -174,39 +191,43 @@ pipeline {
/* compilo installers SOLO stable / beta */
if (env.BRANCH_NAME == "stable" || env.BRANCH_NAME.contains("beta") ) {
parallel (
ADM_IO: {
sleep 2
ALL: {
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// pubblico su server deploy!
publishToDeployServer("MP-SITE\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "SITE")
// },
// LAND_MON_TAB: {
// LAND
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// pubblico su server deploy!
publishToDeployServer("MP-LAND\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "LAND")
// MON
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// pubblico su server deploy!
publishToDeployServer("MP-MON\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "MON")
// 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"
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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 /p:verbosity=minimal"
// pubblico su server deploy!
publishToDeployServer("MP-TAB\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "TAB")
// MAG
bat "\"${tool 'MSBuild-16.0'}\" \"/p:m=8 /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}/MAG.zip /p:DeployIisAppPath=\"Default Web Site/MP/MAG\" /p:PackageAsSingleFile=True /p:OutputPath=bin/ MP-MAG/MP-MAG.csproj /p:verbosity=minimal"
// pubblico su server deploy!
publishToDeployServer("MP-MAG\\", "c:\\inetpub\\wwwroot\\SWS\\MAPO\\", "MAG")
},
failFast: false)
}
@@ -263,6 +284,12 @@ pipeline {
classifier: "${env.classifier}",
file: "MP-TAB\\ReleaseClienti\\${env.BRANCH_NAME}\\TAB.zip",
type: 'zip'
],
[
artifactId: 'MP-MAG',
classifier: "${env.classifier}",
file: "MP-MAG\\ReleaseClienti\\${env.BRANCH_NAME}\\MAG.zip",
type: 'zip'
]
],
credentialsId: 'bc9d8e92-4302-3266-817f-7b58501d12d5',
+16 -95
View File
@@ -27,162 +27,83 @@ 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}.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}.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}.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
+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
+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
}
}
+124
View File
@@ -15,6 +15,55 @@ namespace MP_ADM
#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;
@@ -27,6 +76,21 @@ namespace MP_ADM
#region Public Properties
/// <summary>
/// Clipboard corrente utente
/// </summary>
public string clipboard
{
get
{
return memLayer.ML.StringSessionObj("UserClipboard");
}
set
{
memLayer.ML.setSessionVal("UserClipboard", value);
}
}
/// <summary>
/// titolo pagina
/// </summary>
@@ -98,6 +162,56 @@ namespace MP_ADM
#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>
@@ -147,6 +261,16 @@ namespace MP_ADM
}
}
/// <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
/// </summary>
+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
+3 -3
View File
@@ -1,7 +1,7 @@
/*!
* Bootstrap Grid v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap Grid v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
html {
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
+7 -7
View File
@@ -1,7 +1,7 @@
/*!
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap Reboot v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* 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)
*/
@@ -24,7 +24,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
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-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation 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;
@@ -186,6 +186,7 @@ caption {
th {
text-align: inherit;
text-align: -webkit-match-parent;
}
label {
@@ -197,9 +198,8 @@ button {
border-radius: 0;
}
button:focus {
outline: 1px dotted;
outline: 5px auto -webkit-focus-ring-color;
button:focus:not(:focus-visible) {
outline: 0;
}
input,
File diff suppressed because one or more lines are too long
+4 -4
View File
@@ -1,8 +1,8 @@
/*!
* Bootstrap Reboot v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap Reboot v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* 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)
*/*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}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}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-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}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([class]){color:inherit;text-decoration:none}a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
*/*,::after,::before{box-sizing:border-box}html{font-family:sans-serif;line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}body{margin:0;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans","Liberation 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}hr{box-sizing:content-box;height:0;overflow:visible}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[data-original-title],abbr[title]{text-decoration:underline;-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}address{margin-bottom:1rem;font-style:normal;line-height:inherit}dl,ol,ul{margin-top:0;margin-bottom:1rem}ol ol,ol ul,ul ol,ul ul{margin-bottom:0}dt{font-weight:700}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}b,strong{font-weight:bolder}small{font-size:80%}sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}a{color:#007bff;text-decoration:none;background-color:transparent}a:hover{color:#0056b3;text-decoration:underline}a:not([href]):not([class]){color:inherit;text-decoration:none}a:not([href]):not([class]):hover{color:inherit;text-decoration:none}code,kbd,pre,samp{font-family:SFMono-Regular,Menlo,Monaco,Consolas,"Liberation Mono","Courier New",monospace;font-size:1em}pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}figure{margin:0 0 1rem}img{vertical-align:middle;border-style:none}svg{overflow:hidden;vertical-align:middle}table{border-collapse:collapse}caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}th{text-align:inherit;text-align:-webkit-match-parent}label{display:inline-block;margin-bottom:.5rem}button{border-radius:0}button:focus:not(:focus-visible){outline:0}button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}button,input{overflow:visible}button,select{text-transform:none}[role=button]{cursor:pointer}select{word-wrap:normal}[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}textarea{overflow:auto;resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit;color:inherit;white-space:normal}progress{vertical-align:baseline}[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}[type=search]{outline-offset:-2px;-webkit-appearance:none}[type=search]::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}output{display:inline-block}summary{display:list-item;cursor:pointer}template{display:none}[hidden]{display:none!important}
/*# sourceMappingURL=bootstrap-reboot.min.css.map */
File diff suppressed because one or more lines are too long
+89 -50
View File
@@ -1,7 +1,7 @@
/*!
* Bootstrap v4.5.2 (https://getbootstrap.com/)
* Copyright 2011-2020 The Bootstrap Authors
* Copyright 2011-2020 Twitter, Inc.
* Bootstrap v4.6.0 (https://getbootstrap.com/)
* Copyright 2011-2021 The Bootstrap Authors
* Copyright 2011-2021 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
*/
:root {
@@ -31,7 +31,7 @@
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
--font-family-sans-serif: -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-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
--font-family-monospace: SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
}
@@ -54,7 +54,7 @@ article, aside, figcaption, figure, footer, header, hgroup, main, nav, section {
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-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation 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;
@@ -216,6 +216,7 @@ caption {
th {
text-align: inherit;
text-align: -webkit-match-parent;
}
label {
@@ -227,9 +228,8 @@ button {
border-radius: 0;
}
button:focus {
outline: 1px dotted;
outline: 5px auto -webkit-focus-ring-color;
button:focus:not(:focus-visible) {
outline: 0;
}
input,
@@ -2240,6 +2240,11 @@ textarea.form-control {
border-radius: 0.25rem;
}
.form-row > .col > .valid-tooltip,
.form-row > [class*="col-"] > .valid-tooltip {
left: 5px;
}
.was-validated :valid ~ .valid-feedback,
.was-validated :valid ~ .valid-tooltip,
.is-valid ~ .valid-feedback,
@@ -2269,7 +2274,7 @@ textarea.form-control {
.was-validated .custom-select:valid, .custom-select.is-valid {
border-color: #28a745;
padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
}
.was-validated .custom-select:valid:focus, .custom-select.is-valid:focus {
@@ -2341,6 +2346,11 @@ textarea.form-control {
border-radius: 0.25rem;
}
.form-row > .col > .invalid-tooltip,
.form-row > [class*="col-"] > .invalid-tooltip {
left: 5px;
}
.was-validated :invalid ~ .invalid-feedback,
.was-validated :invalid ~ .invalid-tooltip,
.is-invalid ~ .invalid-feedback,
@@ -2370,7 +2380,7 @@ textarea.form-control {
.was-validated .custom-select:invalid, .custom-select.is-invalid {
border-color: #dc3545;
padding-right: calc(0.75em + 2.3125rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px, url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") #fff no-repeat center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat, #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") center right 1.75rem/calc(0.75em + 0.375rem) calc(0.75em + 0.375rem) no-repeat;
}
.was-validated .custom-select:invalid:focus, .custom-select.is-invalid:focus {
@@ -3387,7 +3397,7 @@ input[type="button"].btn-block {
.dropdown-item:hover, .dropdown-item:focus {
color: #16181b;
text-decoration: none;
background-color: #f8f9fa;
background-color: #e9ecef;
}
.dropdown-item.active, .dropdown-item:active {
@@ -3397,7 +3407,7 @@ input[type="button"].btn-block {
}
.dropdown-item.disabled, .dropdown-item:disabled {
color: #6c757d;
color: #adb5bd;
pointer-events: none;
background-color: transparent;
}
@@ -3596,12 +3606,6 @@ input[type="button"].btn-block {
z-index: 4;
}
.input-group > .form-control:not(:last-child),
.input-group > .custom-select:not(:last-child) {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group > .form-control:not(:first-child),
.input-group > .custom-select:not(:first-child) {
border-top-left-radius: 0;
@@ -3616,14 +3620,23 @@ input[type="button"].btn-block {
}
.input-group > .custom-file:not(:last-child) .custom-file-label,
.input-group > .custom-file:not(:last-child) .custom-file-label::after {
.input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}
.input-group:not(.has-validation) > .form-control:not(:last-child),
.input-group:not(.has-validation) > .custom-select:not(:last-child),
.input-group:not(.has-validation) > .custom-file:not(:last-child) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group > .custom-file:not(:first-child) .custom-file-label {
border-top-left-radius: 0;
border-bottom-left-radius: 0;
.input-group.has-validation > .form-control:nth-last-child(n + 3),
.input-group.has-validation > .custom-select:nth-last-child(n + 3),
.input-group.has-validation > .custom-file:nth-last-child(n + 3) .custom-file-label::after {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
}
.input-group-prepend,
@@ -3726,8 +3739,10 @@ input[type="button"].btn-block {
.input-group > .input-group-prepend > .btn,
.input-group > .input-group-prepend > .input-group-text,
.input-group > .input-group-append:not(:last-child) > .btn,
.input-group > .input-group-append:not(:last-child) > .input-group-text,
.input-group:not(.has-validation) > .input-group-append:not(:last-child) > .btn,
.input-group:not(.has-validation) > .input-group-append:not(:last-child) > .input-group-text,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .btn,
.input-group.has-validation > .input-group-append:nth-last-child(n + 3) > .input-group-text,
.input-group > .input-group-append:last-child > .btn:not(:last-child):not(.dropdown-toggle),
.input-group > .input-group-append:last-child > .input-group-text:not(:last-child) {
border-top-right-radius: 0;
@@ -3750,6 +3765,8 @@ input[type="button"].btn-block {
display: block;
min-height: 1.5rem;
padding-left: 1.5rem;
-webkit-print-color-adjust: exact;
color-adjust: exact;
}
.custom-control-inline {
@@ -3822,7 +3839,7 @@ input[type="button"].btn-block {
width: 1rem;
height: 1rem;
content: "";
background: no-repeat 50% / 50% 50%;
background: 50% / 50% 50% no-repeat;
}
.custom-checkbox .custom-control-label::before {
@@ -3911,7 +3928,7 @@ input[type="button"].btn-block {
line-height: 1.5;
color: #495057;
vertical-align: middle;
background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") no-repeat right 0.75rem center/8px 10px;
background: #fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right 0.75rem center/8px 10px no-repeat;
border: 1px solid #ced4da;
border-radius: 0.25rem;
-webkit-appearance: none;
@@ -3980,6 +3997,7 @@ input[type="button"].btn-block {
width: 100%;
height: calc(1.5em + 0.75rem + 2px);
margin: 0;
overflow: hidden;
opacity: 0;
}
@@ -4009,6 +4027,7 @@ input[type="button"].btn-block {
z-index: 1;
height: calc(1.5em + 0.75rem + 2px);
padding: 0.375rem 0.75rem;
overflow: hidden;
font-weight: 400;
line-height: 1.5;
color: #495057;
@@ -4045,7 +4064,7 @@ input[type="button"].btn-block {
}
.custom-range:focus {
outline: none;
outline: 0;
}
.custom-range:focus::-webkit-slider-thumb {
@@ -4240,11 +4259,8 @@ input[type="button"].btn-block {
border-bottom: 1px solid #dee2e6;
}
.nav-tabs .nav-item {
margin-bottom: -1px;
}
.nav-tabs .nav-link {
margin-bottom: -1px;
border: 1px solid transparent;
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
@@ -4400,8 +4416,12 @@ input[type="button"].btn-block {
height: 1.5em;
vertical-align: middle;
content: "";
background: no-repeat center center;
background-size: 100% 100%;
background: 50% / 100% 100% no-repeat;
}
.navbar-nav-scroll {
max-height: 75vh;
overflow-y: auto;
}
@media (max-width: 575.98px) {
@@ -4435,6 +4455,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
}
.navbar-expand-sm .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-sm .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
@@ -4477,6 +4500,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
}
.navbar-expand-md .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-md .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
@@ -4519,6 +4545,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
}
.navbar-expand-lg .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-lg .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
@@ -4561,6 +4590,9 @@ input[type="button"].btn-block {
-ms-flex-wrap: nowrap;
flex-wrap: nowrap;
}
.navbar-expand-xl .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand-xl .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
@@ -4605,6 +4637,10 @@ input[type="button"].btn-block {
flex-wrap: nowrap;
}
.navbar-expand .navbar-nav-scroll {
overflow: visible;
}
.navbar-expand .navbar-collapse {
display: -ms-flexbox !important;
display: flex !important;
@@ -4969,17 +5005,12 @@ input[type="button"].btn-block {
border-radius: 0.25rem;
}
.breadcrumb-item {
display: -ms-flexbox;
display: flex;
}
.breadcrumb-item + .breadcrumb-item {
padding-left: 0.5rem;
}
.breadcrumb-item + .breadcrumb-item::before {
display: inline-block;
float: left;
padding-right: 0.5rem;
color: #6c757d;
content: "/";
@@ -5289,6 +5320,7 @@ a.badge-dark:focus, a.badge-dark.focus {
position: absolute;
top: 0;
right: 0;
z-index: 2;
padding: 0.75rem 1.25rem;
color: inherit;
}
@@ -5461,8 +5493,8 @@ a.badge-dark:focus, a.badge-dark.focus {
}
.progress-bar-animated {
-webkit-animation: progress-bar-stripes 1s linear infinite;
animation: progress-bar-stripes 1s linear infinite;
-webkit-animation: 1s linear infinite progress-bar-stripes;
animation: 1s linear infinite progress-bar-stripes;
}
@media (prefers-reduced-motion: reduce) {
@@ -6141,7 +6173,7 @@ a.close.disabled {
z-index: 1070;
display: block;
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-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal;
font-weight: 400;
line-height: 1.5;
@@ -6254,7 +6286,7 @@ a.close.disabled {
z-index: 1060;
display: block;
max-width: 276px;
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-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
font-style: normal;
font-weight: 400;
line-height: 1.5;
@@ -6542,7 +6574,7 @@ a.close.disabled {
display: inline-block;
width: 20px;
height: 20px;
background: no-repeat 50% / 100% 100%;
background: 50% / 100% 100% no-repeat;
}
.carousel-control-prev-icon {
@@ -6631,8 +6663,8 @@ a.close.disabled {
border: 0.25em solid currentColor;
border-right-color: transparent;
border-radius: 50%;
-webkit-animation: spinner-border .75s linear infinite;
animation: spinner-border .75s linear infinite;
-webkit-animation: .75s linear infinite spinner-border;
animation: .75s linear infinite spinner-border;
}
.spinner-border-sm {
@@ -6673,8 +6705,8 @@ a.close.disabled {
background-color: currentColor;
border-radius: 50%;
opacity: 0;
-webkit-animation: spinner-grow .75s linear infinite;
animation: spinner-grow .75s linear infinite;
-webkit-animation: .75s linear infinite spinner-grow;
animation: .75s linear infinite spinner-grow;
}
.spinner-grow-sm {
@@ -6682,6 +6714,14 @@ a.close.disabled {
height: 1rem;
}
@media (prefers-reduced-motion: reduce) {
.spinner-border,
.spinner-grow {
-webkit-animation-duration: 1.5s;
animation-duration: 1.5s;
}
}
.align-baseline {
vertical-align: baseline !important;
}
@@ -7950,7 +7990,6 @@ button.bg-dark:focus {
.user-select-all {
-webkit-user-select: all !important;
-moz-user-select: all !important;
-ms-user-select: all !important;
user-select: all !important;
}
@@ -10163,7 +10202,7 @@ a.text-dark:hover, a.text-dark:focus {
.text-break {
word-break: break-word !important;
overflow-wrap: break-word !important;
word-wrap: break-word !important;
}
.text-reset {
File diff suppressed because one or more lines are too long
+4 -4
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+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
}
}
+1
View File
@@ -0,0 +1 @@

+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 =
+298 -76
View File
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -46,17 +47,17 @@
<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 Include="AegisImplicitMail, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AIM.1.1.0\lib\netstandard2.0\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 Include="AspNet.ScriptManager.bootstrap, Version=4.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.bootstrap.4.6.0\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.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.3.6.0\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>
@@ -64,42 +65,42 @@
<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>
<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.4.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.4.0\lib\net45\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.3.2.10, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.2\lib\net45\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>
<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.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\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>
<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="MongoDB.Bson, Version=2.12.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.12.3\lib\net452\MongoDB.Bson.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="MongoDB.Driver, Version=2.12.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.12.3\lib\net452\MongoDB.Driver.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="MongoDB.Driver.Core, Version=2.12.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.12.3\lib\net452\MongoDB.Driver.Core.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="MongoDB.Libmongocrypt, Version=1.2.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.2.1\lib\net452\MongoDB.Libmongocrypt.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="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.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>
<HintPath>..\packages\NLog.4.7.10\lib\net45\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,22 +109,23 @@
<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.0\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 Include="SharpCompress, Version=0.28.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.28.2\lib\netstandard2.0\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>
<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.2.4\lib\net461\StackExchange.Redis.dll</HintPath>
<Private>True</Private>
</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.1.2105.758, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.1.2105.758\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.1.2105.758, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.Logger.5.1.2105.758\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>
@@ -132,14 +134,14 @@
<Reference Include="System" />
<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.Diagnostics.PerformanceCounter, Version=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.5.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<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=5.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.5.0.1\lib\net461\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>
@@ -151,21 +153,23 @@
<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=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\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.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=5.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.5.0.1\lib\net461\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>
@@ -173,8 +177,11 @@
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.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.Text.Encoding.CodePages, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.5.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.5.0.0\lib\net461\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>
@@ -299,6 +306,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 +399,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 +443,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" />
@@ -452,11 +482,11 @@
<Content Include="Resources\ChangeLog.html" />
<Content Include="Resources\logoSteamware.png" />
<Content Include="Resources\manifest.xml" />
<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.js" />
<Content Include="Content\fonts.less" />
<Content Include="Content\Style.less" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Scripts\esm\popper-utils.js" />
<Content Include="Scripts\esm\popper-utils.min.js" />
@@ -467,6 +497,16 @@
<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="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include="libmongocrypt.so" />
<Content Include="libmongocrypt.dylib" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
<Content Include="Scripts\bootstrap.bundle.min.js.map" />
@@ -477,16 +517,14 @@
<Content Include="Content\bootstrap-reboot.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" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<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.6.0.intellisense.js" />
<Content Include="Scripts\jquery-3.6.0.js" />
<Content Include="Scripts\jquery-3.6.0.min.js" />
<Content Include="Scripts\jquery-3.6.0.slim.js" />
<Content Include="Scripts\jquery-3.6.0.slim.min.js" />
<Content Include="Scripts\popper-utils.js" />
<Content Include="Scripts\popper-utils.min.js" />
<Content Include="Scripts\popper.js" />
@@ -561,11 +599,32 @@
<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_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 +637,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 +646,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" />
@@ -777,6 +835,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 +871,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 +892,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 +927,13 @@
<Compile Include="WebMasterPages\MoonPro_noAjax.master.designer.cs">
<DependentUpon>MoonPro_noAjax.master</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 +941,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 +1083,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 +1111,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 +1158,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 +1181,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 +1216,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,8 +1279,8 @@
<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="Scripts\jquery-3.6.0.slim.min.map" />
<Content Include="Scripts\jquery-3.6.0.min.map" />
<None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon>
</None>
@@ -1098,6 +1313,10 @@
<ItemGroup>
<TypeScriptCompile Include="Scripts\index.d.ts" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
@@ -1144,7 +1363,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 +1379,14 @@
<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\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.12.3\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.12.3\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\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.5.0.3\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.2.1\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.12.3\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.12.3\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;
}
}
+458 -436
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
+463 -441
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
@@ -1,15 +1,15 @@
/*!
* jQuery JavaScript Library v3.5.1
* jQuery JavaScript Library v3.6.0
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2020-05-04T22:49Z
* Date: 2021-03-02T17:08Z
*/
( function( global, factory ) {
@@ -76,12 +76,16 @@ var support = {};
var isFunction = function isFunction( obj ) {
// Support: Chrome <=57, Firefox <=52
// In some browsers, typeof returns "function" for HTML <object> elements
// (i.e., `typeof document.createElement( "object" ) === "function"`).
// We don't want to classify *any* DOM node as a function.
return typeof obj === "function" && typeof obj.nodeType !== "number";
};
// Support: Chrome <=57, Firefox <=52
// In some browsers, typeof returns "function" for HTML <object> elements
// (i.e., `typeof document.createElement( "object" ) === "function"`).
// We don't want to classify *any* DOM node as a function.
// Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5
// Plus for old WebKit, typeof returns "function" for HTML collections
// (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756)
return typeof obj === "function" && typeof obj.nodeType !== "number" &&
typeof obj.item !== "function";
};
var isWindow = function isWindow( obj ) {
@@ -147,7 +151,7 @@ function toType( obj ) {
var
version = "3.5.1",
version = "3.6.0",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -401,7 +405,7 @@ jQuery.extend( {
if ( isArrayLike( Object( arr ) ) ) {
jQuery.merge( ret,
typeof arr === "string" ?
[ arr ] : arr
[ arr ] : arr
);
} else {
push.call( ret, arr );
@@ -496,9 +500,9 @@ if ( typeof Symbol === "function" ) {
// Populate the class2type map
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
function( _i, name ) {
class2type[ "[object " + name + "]" ] = name.toLowerCase();
} );
function( _i, name ) {
class2type[ "[object " + name + "]" ] = name.toLowerCase();
} );
function isArrayLike( obj ) {
@@ -518,14 +522,14 @@ function isArrayLike( obj ) {
}
var Sizzle =
/*!
* Sizzle CSS Selector Engine v2.3.5
* Sizzle CSS Selector Engine v2.3.6
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
* Date: 2021-02-16
*/
( function( window ) {
var i,
@@ -1108,8 +1112,8 @@ support = Sizzle.support = {};
* @returns {Boolean} True iff elem is a non-HTML XML node
*/
isXML = Sizzle.isXML = function( elem ) {
var namespace = elem.namespaceURI,
docElem = ( elem.ownerDocument || elem ).documentElement;
var namespace = elem && elem.namespaceURI,
docElem = elem && ( elem.ownerDocument || elem ).documentElement;
// Support: IE <=8
// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -3024,9 +3028,9 @@ var rneedsContext = jQuery.expr.match.needsContext;
function nodeName( elem, name ) {
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
};
}
var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
@@ -3997,8 +4001,8 @@ jQuery.extend( {
resolveContexts = Array( i ),
resolveValues = slice.call( arguments ),
// the master Deferred
master = jQuery.Deferred(),
// the primary Deferred
primary = jQuery.Deferred(),
// subordinate callback factory
updateFunc = function( i ) {
@@ -4006,30 +4010,30 @@ jQuery.extend( {
resolveContexts[ i ] = this;
resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
if ( !( --remaining ) ) {
master.resolveWith( resolveContexts, resolveValues );
primary.resolveWith( resolveContexts, resolveValues );
}
};
};
// Single- and empty arguments are adopted like Promise.resolve
if ( remaining <= 1 ) {
adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
!remaining );
// Use .then() to unwrap secondary thenables (cf. gh-3000)
if ( master.state() === "pending" ||
if ( primary.state() === "pending" ||
isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
return master.then();
return primary.then();
}
}
// Multiple arguments are aggregated like Promise.all array elements
while ( i-- ) {
adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
}
return master.promise();
return primary.promise();
}
} );
@@ -4180,8 +4184,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
for ( ; i < len; i++ ) {
fn(
elems[ i ], key, raw ?
value :
value.call( elems[ i ], i, fn( elems[ i ], key ) )
value :
value.call( elems[ i ], i, fn( elems[ i ], key ) )
);
}
}
@@ -5089,10 +5093,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
}
var
rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
var rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
function returnTrue() {
return true;
@@ -5387,8 +5388,8 @@ jQuery.event = {
event = jQuery.event.fix( nativeEvent ),
handlers = (
dataPriv.get( this, "events" ) || Object.create( null )
)[ event.type ] || [],
dataPriv.get( this, "events" ) || Object.create( null )
)[ event.type ] || [],
special = jQuery.event.special[ event.type ] || {};
// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5512,12 +5513,12 @@ jQuery.event = {
get: isFunction( hook ) ?
function() {
if ( this.originalEvent ) {
return hook( this.originalEvent );
return hook( this.originalEvent );
}
} :
function() {
if ( this.originalEvent ) {
return this.originalEvent[ name ];
return this.originalEvent[ name ];
}
},
@@ -5656,7 +5657,13 @@ function leverageNative( el, type, expectSync ) {
// Cancel the outer synthetic event
event.stopImmediatePropagation();
event.preventDefault();
return result.value;
// Support: Chrome 86+
// In Chrome, if an element having a focusout handler is blurred by
// clicking outside of it, it invokes the handler synchronously. If
// that handler calls `.remove()` on the element, the data is cleared,
// leaving `result` undefined. We need to guard against this.
return result && result.value;
}
// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5821,34 +5828,7 @@ jQuery.each( {
targetTouches: true,
toElement: true,
touches: true,
which: function( event ) {
var button = event.button;
// Add which for key events
if ( event.which == null && rkeyEvent.test( event.type ) ) {
return event.charCode != null ? event.charCode : event.keyCode;
}
// Add which for click: 1 === left; 2 === middle; 3 === right
if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
if ( button & 1 ) {
return 1;
}
if ( button & 2 ) {
return 3;
}
if ( button & 4 ) {
return 2;
}
return 0;
}
return event.which;
}
which: true
}, jQuery.event.addProp );
jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
@@ -5874,6 +5854,12 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
return true;
},
// Suppress native focus or blur as it's already being fired
// in leverageNative.
_default: function() {
return true;
},
delegateType: delegateType
};
} );
@@ -6541,6 +6527,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
// set in CSS while `offset*` properties report correct values.
// Behavior in IE 9 is more subtle than in newer versions & it passes
// some versions of this test; make sure not to make it pass there!
//
// Support: Firefox 70+
// Only Firefox includes border widths
// in computed dimensions. (gh-4529)
reliableTrDimensions: function() {
var table, tr, trChild, trStyle;
if ( reliableTrDimensionsVal == null ) {
@@ -6548,17 +6538,32 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
tr = document.createElement( "tr" );
trChild = document.createElement( "div" );
table.style.cssText = "position:absolute;left:-11111px";
table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
tr.style.cssText = "border:1px solid";
// Support: Chrome 86+
// Height set through cssText does not get applied.
// Computed height then comes back as 0.
tr.style.height = "1px";
trChild.style.height = "9px";
// Support: Android 8 Chrome 86+
// In our bodyBackground.html iframe,
// display for all div elements is set to "inline",
// which causes a problem only in Android 8 Chrome 86.
// Ensuring the div is display: block
// gets around this issue.
trChild.style.display = "block";
documentElement
.appendChild( table )
.appendChild( tr )
.appendChild( trChild );
trStyle = window.getComputedStyle( tr );
reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) +
parseInt( trStyle.borderTopWidth, 10 ) +
parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight;
documentElement.removeChild( table );
}
@@ -7022,10 +7027,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
// Running getBoundingClientRect on a disconnected node
// in IE throws an error.
( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
swap( elem, cssShow, function() {
return getWidthOrHeight( elem, dimension, extra );
} ) :
getWidthOrHeight( elem, dimension, extra );
swap( elem, cssShow, function() {
return getWidthOrHeight( elem, dimension, extra );
} ) :
getWidthOrHeight( elem, dimension, extra );
}
},
@@ -7084,7 +7089,7 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
swap( elem, { marginLeft: 0 }, function() {
return elem.getBoundingClientRect().left;
} )
) + "px";
) + "px";
}
}
);
@@ -7223,7 +7228,7 @@ Tween.propHooks = {
if ( jQuery.fx.step[ tween.prop ] ) {
jQuery.fx.step[ tween.prop ]( tween );
} else if ( tween.elem.nodeType === 1 && (
jQuery.cssHooks[ tween.prop ] ||
jQuery.cssHooks[ tween.prop ] ||
tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
} else {
@@ -7468,7 +7473,7 @@ function defaultPrefilter( elem, props, opts ) {
anim.done( function() {
/* eslint-enable no-loop-func */
/* eslint-enable no-loop-func */
// The final step of a "hide" animation is actually hiding the element
if ( !hidden ) {
@@ -7588,7 +7593,7 @@ function Animation( elem, properties, options ) {
tweens: [],
createTween: function( prop, end ) {
var tween = jQuery.Tween( elem, animation.opts, prop, end,
animation.opts.specialEasing[ prop ] || animation.opts.easing );
animation.opts.specialEasing[ prop ] || animation.opts.easing );
animation.tweens.push( tween );
return tween;
},
@@ -7761,7 +7766,8 @@ jQuery.fn.extend( {
anim.stop( true );
}
};
doAnimation.finish = doAnimation;
doAnimation.finish = doAnimation;
return empty || optall.queue === false ?
this.each( doAnimation ) :
@@ -8401,8 +8407,8 @@ jQuery.fn.extend( {
if ( this.setAttribute ) {
this.setAttribute( "class",
className || value === false ?
"" :
dataPriv.get( this, "__className__" ) || ""
"" :
dataPriv.get( this, "__className__" ) || ""
);
}
}
@@ -8417,7 +8423,7 @@ jQuery.fn.extend( {
while ( ( elem = this[ i++ ] ) ) {
if ( elem.nodeType === 1 &&
( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
return true;
return true;
}
}
@@ -8707,9 +8713,7 @@ jQuery.extend( jQuery.event, {
special.bindType || type;
// jQuery handler
handle = (
dataPriv.get( cur, "events" ) || Object.create( null )
)[ event.type ] &&
handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
dataPriv.get( cur, "handle" );
if ( handle ) {
handle.apply( cur, data );
@@ -8856,7 +8860,7 @@ var rquery = ( /\?/ );
// Cross-browser xml parsing
jQuery.parseXML = function( data ) {
var xml;
var xml, parserErrorElem;
if ( !data || typeof data !== "string" ) {
return null;
}
@@ -8865,12 +8869,17 @@ jQuery.parseXML = function( data ) {
// IE throws on parseFromString with invalid input.
try {
xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
} catch ( e ) {
xml = undefined;
}
} catch ( e ) {}
if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
jQuery.error( "Invalid XML: " + data );
parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
if ( !xml || parserErrorElem ) {
jQuery.error( "Invalid XML: " + (
parserErrorElem ?
jQuery.map( parserErrorElem.childNodes, function( el ) {
return el.textContent;
} ).join( "\n" ) :
data
) );
}
return xml;
};
@@ -8971,16 +8980,14 @@ jQuery.fn.extend( {
// Can add propHook for "elements" to filter or add form elements
var elements = jQuery.prop( this, "elements" );
return elements ? jQuery.makeArray( elements ) : this;
} )
.filter( function() {
} ).filter( function() {
var type = this.type;
// Use .is( ":disabled" ) so that fieldset[disabled] works
return this.name && !jQuery( this ).is( ":disabled" ) &&
rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
( this.checked || !rcheckableType.test( type ) );
} )
.map( function( _i, elem ) {
} ).map( function( _i, elem ) {
var val = jQuery( this ).val();
if ( val == null ) {
@@ -9033,7 +9040,8 @@ var
// Anchor tag for parsing the document origin
originAnchor = document.createElement( "a" );
originAnchor.href = location.href;
originAnchor.href = location.href;
// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
function addToPrefiltersOrTransports( structure ) {
@@ -9414,8 +9422,8 @@ jQuery.extend( {
// Context for global events is callbackContext if it is a DOM node or jQuery collection
globalEventContext = s.context &&
( callbackContext.nodeType || callbackContext.jquery ) ?
jQuery( callbackContext ) :
jQuery.event,
jQuery( callbackContext ) :
jQuery.event,
// Deferreds
deferred = jQuery.Deferred(),
@@ -9727,8 +9735,10 @@ jQuery.extend( {
response = ajaxHandleResponses( s, jqXHR, responses );
}
// Use a noop converter for missing script
if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
// Use a noop converter for missing script but not if jsonp
if ( !isSuccess &&
jQuery.inArray( "script", s.dataTypes ) > -1 &&
jQuery.inArray( "json", s.dataTypes ) < 0 ) {
s.converters[ "text script" ] = function() {};
}
@@ -10466,12 +10476,6 @@ jQuery.offset = {
options.using.call( elem, props );
} else {
if ( typeof props.top === "number" ) {
props.top += "px";
}
if ( typeof props.left === "number" ) {
props.left += "px";
}
curElem.css( props );
}
}
@@ -10640,8 +10644,11 @@ jQuery.each( [ "top", "left" ], function( _i, prop ) {
// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
function( defaultExtra, funcName ) {
jQuery.each( {
padding: "inner" + name,
content: type,
"": "outer" + name
}, function( defaultExtra, funcName ) {
// Margin is only for outerHeight, outerWidth
jQuery.fn[ funcName ] = function( margin, value ) {
@@ -10726,7 +10733,8 @@ jQuery.fn.extend( {
}
} );
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
jQuery.each(
( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( _i, name ) {
@@ -10737,7 +10745,8 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
this.on( name, null, data, fn ) :
this.trigger( name );
};
} );
}
);
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,15 +1,15 @@
/*!
* jQuery JavaScript Library v3.5.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector
* jQuery JavaScript Library v3.6.0 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector
* https://jquery.com/
*
* Includes Sizzle.js
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Copyright OpenJS Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
*
* Date: 2020-05-04T22:49Z
* Date: 2021-03-02T17:08Z
*/
( function( global, factory ) {
@@ -76,12 +76,16 @@ var support = {};
var isFunction = function isFunction( obj ) {
// Support: Chrome <=57, Firefox <=52
// In some browsers, typeof returns "function" for HTML <object> elements
// (i.e., `typeof document.createElement( "object" ) === "function"`).
// We don't want to classify *any* DOM node as a function.
return typeof obj === "function" && typeof obj.nodeType !== "number";
};
// Support: Chrome <=57, Firefox <=52
// In some browsers, typeof returns "function" for HTML <object> elements
// (i.e., `typeof document.createElement( "object" ) === "function"`).
// We don't want to classify *any* DOM node as a function.
// Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5
// Plus for old WebKit, typeof returns "function" for HTML collections
// (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756)
return typeof obj === "function" && typeof obj.nodeType !== "number" &&
typeof obj.item !== "function";
};
var isWindow = function isWindow( obj ) {
@@ -147,7 +151,7 @@ function toType( obj ) {
var
version = "3.5.1 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector",
version = "3.6.0 -ajax,-ajax/jsonp,-ajax/load,-ajax/script,-ajax/var/location,-ajax/var/nonce,-ajax/var/rquery,-ajax/xhr,-manipulation/_evalUrl,-deprecated/ajax-event-alias,-effects,-effects/Tween,-effects/animatedSelector",
// Define a local copy of jQuery
jQuery = function( selector, context ) {
@@ -401,7 +405,7 @@ jQuery.extend( {
if ( isArrayLike( Object( arr ) ) ) {
jQuery.merge( ret,
typeof arr === "string" ?
[ arr ] : arr
[ arr ] : arr
);
} else {
push.call( ret, arr );
@@ -496,9 +500,9 @@ if ( typeof Symbol === "function" ) {
// Populate the class2type map
jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
function( _i, name ) {
class2type[ "[object " + name + "]" ] = name.toLowerCase();
} );
function( _i, name ) {
class2type[ "[object " + name + "]" ] = name.toLowerCase();
} );
function isArrayLike( obj ) {
@@ -518,14 +522,14 @@ function isArrayLike( obj ) {
}
var Sizzle =
/*!
* Sizzle CSS Selector Engine v2.3.5
* Sizzle CSS Selector Engine v2.3.6
* https://sizzlejs.com/
*
* Copyright JS Foundation and other contributors
* Released under the MIT license
* https://js.foundation/
*
* Date: 2020-03-14
* Date: 2021-02-16
*/
( function( window ) {
var i,
@@ -1108,8 +1112,8 @@ support = Sizzle.support = {};
* @returns {Boolean} True iff elem is a non-HTML XML node
*/
isXML = Sizzle.isXML = function( elem ) {
var namespace = elem.namespaceURI,
docElem = ( elem.ownerDocument || elem ).documentElement;
var namespace = elem && elem.namespaceURI,
docElem = elem && ( elem.ownerDocument || elem ).documentElement;
// Support: IE <=8
// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -3024,9 +3028,9 @@ var rneedsContext = jQuery.expr.match.needsContext;
function nodeName( elem, name ) {
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
};
}
var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
@@ -3997,8 +4001,8 @@ jQuery.extend( {
resolveContexts = Array( i ),
resolveValues = slice.call( arguments ),
// the master Deferred
master = jQuery.Deferred(),
// the primary Deferred
primary = jQuery.Deferred(),
// subordinate callback factory
updateFunc = function( i ) {
@@ -4006,30 +4010,30 @@ jQuery.extend( {
resolveContexts[ i ] = this;
resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
if ( !( --remaining ) ) {
master.resolveWith( resolveContexts, resolveValues );
primary.resolveWith( resolveContexts, resolveValues );
}
};
};
// Single- and empty arguments are adopted like Promise.resolve
if ( remaining <= 1 ) {
adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
!remaining );
// Use .then() to unwrap secondary thenables (cf. gh-3000)
if ( master.state() === "pending" ||
if ( primary.state() === "pending" ||
isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
return master.then();
return primary.then();
}
}
// Multiple arguments are aggregated like Promise.all array elements
while ( i-- ) {
adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
}
return master.promise();
return primary.promise();
}
} );
@@ -4180,8 +4184,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
for ( ; i < len; i++ ) {
fn(
elems[ i ], key, raw ?
value :
value.call( elems[ i ], i, fn( elems[ i ], key ) )
value :
value.call( elems[ i ], i, fn( elems[ i ], key ) )
);
}
}
@@ -5089,10 +5093,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
}
var
rkeyEvent = /^key/,
rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
var rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
function returnTrue() {
return true;
@@ -5387,8 +5388,8 @@ jQuery.event = {
event = jQuery.event.fix( nativeEvent ),
handlers = (
dataPriv.get( this, "events" ) || Object.create( null )
)[ event.type ] || [],
dataPriv.get( this, "events" ) || Object.create( null )
)[ event.type ] || [],
special = jQuery.event.special[ event.type ] || {};
// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5512,12 +5513,12 @@ jQuery.event = {
get: isFunction( hook ) ?
function() {
if ( this.originalEvent ) {
return hook( this.originalEvent );
return hook( this.originalEvent );
}
} :
function() {
if ( this.originalEvent ) {
return this.originalEvent[ name ];
return this.originalEvent[ name ];
}
},
@@ -5656,7 +5657,13 @@ function leverageNative( el, type, expectSync ) {
// Cancel the outer synthetic event
event.stopImmediatePropagation();
event.preventDefault();
return result.value;
// Support: Chrome 86+
// In Chrome, if an element having a focusout handler is blurred by
// clicking outside of it, it invokes the handler synchronously. If
// that handler calls `.remove()` on the element, the data is cleared,
// leaving `result` undefined. We need to guard against this.
return result && result.value;
}
// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5821,34 +5828,7 @@ jQuery.each( {
targetTouches: true,
toElement: true,
touches: true,
which: function( event ) {
var button = event.button;
// Add which for key events
if ( event.which == null && rkeyEvent.test( event.type ) ) {
return event.charCode != null ? event.charCode : event.keyCode;
}
// Add which for click: 1 === left; 2 === middle; 3 === right
if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
if ( button & 1 ) {
return 1;
}
if ( button & 2 ) {
return 3;
}
if ( button & 4 ) {
return 2;
}
return 0;
}
return event.which;
}
which: true
}, jQuery.event.addProp );
jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
@@ -5874,6 +5854,12 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
return true;
},
// Suppress native focus or blur as it's already being fired
// in leverageNative.
_default: function() {
return true;
},
delegateType: delegateType
};
} );
@@ -6541,6 +6527,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
// set in CSS while `offset*` properties report correct values.
// Behavior in IE 9 is more subtle than in newer versions & it passes
// some versions of this test; make sure not to make it pass there!
//
// Support: Firefox 70+
// Only Firefox includes border widths
// in computed dimensions. (gh-4529)
reliableTrDimensions: function() {
var table, tr, trChild, trStyle;
if ( reliableTrDimensionsVal == null ) {
@@ -6548,17 +6538,32 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
tr = document.createElement( "tr" );
trChild = document.createElement( "div" );
table.style.cssText = "position:absolute;left:-11111px";
table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
tr.style.cssText = "border:1px solid";
// Support: Chrome 86+
// Height set through cssText does not get applied.
// Computed height then comes back as 0.
tr.style.height = "1px";
trChild.style.height = "9px";
// Support: Android 8 Chrome 86+
// In our bodyBackground.html iframe,
// display for all div elements is set to "inline",
// which causes a problem only in Android 8 Chrome 86.
// Ensuring the div is display: block
// gets around this issue.
trChild.style.display = "block";
documentElement
.appendChild( table )
.appendChild( tr )
.appendChild( trChild );
trStyle = window.getComputedStyle( tr );
reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) +
parseInt( trStyle.borderTopWidth, 10 ) +
parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight;
documentElement.removeChild( table );
}
@@ -7022,10 +7027,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
// Running getBoundingClientRect on a disconnected node
// in IE throws an error.
( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
swap( elem, cssShow, function() {
return getWidthOrHeight( elem, dimension, extra );
} ) :
getWidthOrHeight( elem, dimension, extra );
swap( elem, cssShow, function() {
return getWidthOrHeight( elem, dimension, extra );
} ) :
getWidthOrHeight( elem, dimension, extra );
}
},
@@ -7084,7 +7089,7 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
swap( elem, { marginLeft: 0 }, function() {
return elem.getBoundingClientRect().left;
} )
) + "px";
) + "px";
}
}
);
@@ -7608,8 +7613,8 @@ jQuery.fn.extend( {
if ( this.setAttribute ) {
this.setAttribute( "class",
className || value === false ?
"" :
dataPriv.get( this, "__className__" ) || ""
"" :
dataPriv.get( this, "__className__" ) || ""
);
}
}
@@ -7624,7 +7629,7 @@ jQuery.fn.extend( {
while ( ( elem = this[ i++ ] ) ) {
if ( elem.nodeType === 1 &&
( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
return true;
return true;
}
}
@@ -7914,9 +7919,7 @@ jQuery.extend( jQuery.event, {
special.bindType || type;
// jQuery handler
handle = (
dataPriv.get( cur, "events" ) || Object.create( null )
)[ event.type ] &&
handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
dataPriv.get( cur, "handle" );
if ( handle ) {
handle.apply( cur, data );
@@ -8057,7 +8060,7 @@ if ( !support.focusin ) {
// Cross-browser xml parsing
jQuery.parseXML = function( data ) {
var xml;
var xml, parserErrorElem;
if ( !data || typeof data !== "string" ) {
return null;
}
@@ -8066,12 +8069,17 @@ jQuery.parseXML = function( data ) {
// IE throws on parseFromString with invalid input.
try {
xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
} catch ( e ) {
xml = undefined;
}
} catch ( e ) {}
if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
jQuery.error( "Invalid XML: " + data );
parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
if ( !xml || parserErrorElem ) {
jQuery.error( "Invalid XML: " + (
parserErrorElem ?
jQuery.map( parserErrorElem.childNodes, function( el ) {
return el.textContent;
} ).join( "\n" ) :
data
) );
}
return xml;
};
@@ -8172,16 +8180,14 @@ jQuery.fn.extend( {
// Can add propHook for "elements" to filter or add form elements
var elements = jQuery.prop( this, "elements" );
return elements ? jQuery.makeArray( elements ) : this;
} )
.filter( function() {
} ).filter( function() {
var type = this.type;
// Use .is( ":disabled" ) so that fieldset[disabled] works
return this.name && !jQuery( this ).is( ":disabled" ) &&
rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
( this.checked || !rcheckableType.test( type ) );
} )
.map( function( _i, elem ) {
} ).map( function( _i, elem ) {
var val = jQuery( this ).val();
if ( val == null ) {
@@ -8387,12 +8393,6 @@ jQuery.offset = {
options.using.call( elem, props );
} else {
if ( typeof props.top === "number" ) {
props.top += "px";
}
if ( typeof props.left === "number" ) {
props.left += "px";
}
curElem.css( props );
}
}
@@ -8561,8 +8561,11 @@ jQuery.each( [ "top", "left" ], function( _i, prop ) {
// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
function( defaultExtra, funcName ) {
jQuery.each( {
padding: "inner" + name,
content: type,
"": "outer" + name
}, function( defaultExtra, funcName ) {
// Margin is only for outerHeight, outerWidth
jQuery.fn[ funcName ] = function( margin, value ) {
@@ -8631,7 +8634,8 @@ jQuery.fn.extend( {
}
} );
jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
jQuery.each(
( "blur focus focusin focusout resize scroll click dblclick " +
"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
"change select submit keydown keypress keyup contextmenu" ).split( " " ),
function( _i, name ) {
@@ -8642,7 +8646,8 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
this.on( name, null, data, fn ) :
this.trigger( name );
};
} );
}
);
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+8
View File
@@ -4,8 +4,16 @@ namespace MP_ADM
{
public partial class StoricoTC : 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="TechSheetMan.aspx.cs" Inherits="MP_ADM.TechSheetMan" %>
<%@ Register Src="~/WebUserControls/cmp_TechSheetMan.ascx" TagPrefix="uc1" TagName="cmp_TechSheetMan" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:cmp_TechSheetMan runat="server" id="cmp_TechSheetMan" />
</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 TechSheetMan : 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 TechSheetMan
{
/// <summary>
/// Controllo cmp_TechSheetMan.
/// </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_TechSheetMan cmp_TechSheetMan;
}
}
+41
View File
@@ -0,0 +1,41 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/WebMasterPages/MoonPro.master" AutoEventWireup="true" CodeBehind="Vocabolario.aspx.cs" Inherits="MP_ADM.Vocabolario" %>
<%@ Register Src="~/WebUserControls/cmp_lemmiVocab.ascx" TagName="cmp_lemmiVocab" TagPrefix="uc2" %>
<%@ Register Src="~/WebUserControls/cmp_righePag.ascx" TagName="cmp_righePag" TagPrefix="uc3" %>
<%@ Register Src="~/WebUserControls/cmp_ricercaGenerica.ascx" TagPrefix="uc4" TagName="cmp_ricercaGenerica" %>
<%@ Register Src="~/WebUserControls/cmp_vocabolario.ascx" TagPrefix="uc2" TagName="cmp_vocabolario" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="card text-center" style="width: 100%;">
<h3 class="card-header"><%: traduci("Vocabolario") %></h3>
<div class="card-body py-1">
<div class="container-fluid" style="background-color: #cdcdcd; padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-2">
</div>
<div class="col-8 text-center">
<uc4:cmp_ricercaGenerica runat="server" ID="cmp_ricercaGenerica" />
</div>
<div class="col-2 text-right">
<uc3:cmp_righePag runat="server" ID="cmp_righePag" />
</div>
</div>
</div>
</div>
<div class="container-fluid" style="padding-top: 2px; padding-bottom: 2px;">
<div class="container">
<div class="row">
<div class="col-8">
<uc2:cmp_vocabolario runat="server" ID="cmp_vocabolario" />
</div>
<div class="col-4 pt-4">
<uc2:cmp_lemmiVocab runat="server" ID="cmp_lemmiVocab" />
</div>
</div>
</div>
</div>
</div>
</div>
</asp:Content>
+65
View File
@@ -0,0 +1,65 @@
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 Vocabolario : BasePage
{
#region Private Methods
/// <summary>
/// aggiornato numero righe datagrid... aggiorno visualizzazione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void cmp_righePag_eh_newNum(object sender, EventArgs e)
{
cmp_vocabolario.pageSize = cmp_righePag.numRowPag;
}
private void cmp_vocabolario_eh_resetSelezione(object sender, EventArgs e)
{
cmp_lemmiVocab.Visible = false;
Session.Remove("lemma_sel");
}
private void cmp_vocabolario_eh_selezioneValore(object sender, EventArgs e)
{
cmp_lemmiVocab.Visible = true;
cmp_lemmiVocab.doUpdate();
}
#endregion Private Methods
#region Protected Methods
protected override void OnUnload(EventArgs e)
{
base.OnUnload(e);
cmp_vocabolario.eh_selezioneValore -= new EventHandler(cmp_vocabolario_eh_selezioneValore);
cmp_vocabolario.eh_resetSelezione -= new EventHandler(cmp_vocabolario_eh_resetSelezione);
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((MoonPro)this.Master).showSearch = false;
cmp_righePag.numRowPag = 10;
cmp_vocabolario.pageSize = cmp_righePag.numRowPag;
}
// imposto controlli eventi
cmp_vocabolario.eh_selezioneValore += new EventHandler(cmp_vocabolario_eh_selezioneValore);
cmp_vocabolario.eh_resetSelezione += new EventHandler(cmp_vocabolario_eh_resetSelezione);
// setto visibilità dettaglio termini
cmp_lemmiVocab.Visible = false;
cmp_righePag.eh_newNum += cmp_righePag_eh_newNum;
}
#endregion Protected Methods
}
}
+53
View File
@@ -0,0 +1,53 @@
//------------------------------------------------------------------------------
// <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 Vocabolario
{
/// <summary>
/// cmp_ricercaGenerica 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_ricercaGenerica cmp_ricercaGenerica;
/// <summary>
/// cmp_righePag 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_righePag cmp_righePag;
/// <summary>
/// cmp_vocabolario 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_vocabolario cmp_vocabolario;
/// <summary>
/// cmp_lemmiVocab 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_lemmiVocab cmp_lemmiVocab;
}
}
+245 -41
View File
@@ -28,6 +28,7 @@
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionStringIS" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_Jetco;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionStringArca" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_EdilChim;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="MoonProConnectionStringES3" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="PermessiConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
<add key="UtenteCdcConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=MoonPro_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer16;" />
@@ -39,8 +40,7 @@
<add name="MapoDb.Properties.Settings.MoonPro_IS_ConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=MoonPro_IS_ColCom;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.C_TRACKConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=C_TRACK;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
<add name="MapoDb.Properties.Settings.MoonPro_ES3ConnectionString" connectionString="Data Source=sql2016dev;Initial Catalog=MoonPro_ES3;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient" />
<add name="ErrorLog" connectionString="Data Source=SQL2016DEV;Initial Catalog=Elmah;Persist Security Info=True;User ID=sa;Password=keyhammer16;" providerName="System.Data.SqlClient" />
</connectionStrings>
<system.web>
<compilation debug="true" targetFramework="4.6.2" />
@@ -69,6 +69,238 @@
</system.web>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Xml.XPath.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XmlSerializer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.XDocument" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Xml.ReaderWriter" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Timer" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Overlapped" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.RegularExpressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Encoding" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.SecureString" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Principal" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Algorithms" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.3.0.0" newVersion="4.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Xml" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Serialization.Json" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Numerics" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Resources.ResourceManager" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ObjectModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Sockets" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Requests" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Primitives" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.NetworkInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Queryable" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Parallel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq.Expressions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Linq" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization.Extensions" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Globalization" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Dynamic.Runtime" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tracing" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Tools" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.StackTrace" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Debug" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Diagnostics.Contracts" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Data.Common" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel.EventBasedAsync" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ComponentModel" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Concurrent" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.11.0" newVersion="4.0.11.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="B03F5F7F11D50A3A" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.28.2.0" newVersion="0.28.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.1" newVersion="5.0.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
@@ -79,51 +311,23 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.6.0" newVersion="4.0.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="DnsClient" publicKeyToken="4574bb5573c51424" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.2.0" newVersion="1.3.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.26.0.0" newVersion="0.26.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.1.3" newVersion="4.1.1.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.4.0" newVersion="4.1.4.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.2.1" newVersion="4.0.2.1" />
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.2.10" newVersion="1.3.2.10" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.webServer>
<staticContent>
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" />
<remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
</staticContent>
<modules>
<add name="ErrorLog" type="Elmah.ErrorLogModule, Elmah" preCondition="managedHandler" />
<add name="ErrorMail" type="Elmah.ErrorMailModule, Elmah" preCondition="managedHandler" />
+2 -1
View File
@@ -4,7 +4,8 @@
<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagPrefix="uc1" TagName="mod_menuBottom" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
<head runat="server">
<title>Simplepage</title>
<%--<link href="../Style.css" rel="stylesheet" type="text/css" />
+1 -1
View File
@@ -5,7 +5,7 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
<head runat="server">
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+3 -2
View File
@@ -9,7 +9,8 @@
<%@ Register Src="~/WebUserControls/mod_menuBottom.ascx" TagName="mod_menuBottom"
TagPrefix="uc5" %>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
<head runat="server">
<title>MP-ADM: <%: SteamWare.devicesAuthProxy.getPage(Request.Url) %></title>
<link href="~/Content/bootstrap.min.css" rel="stylesheet" type="text/css" />
@@ -64,7 +65,7 @@
<uc3:mod_pageTitleAndSearch ID="Mod_pageTitleAndSearch1" runat="server" />
</div>
<div class="col-4 text-right">
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" Visible="false" />
<uc4:mod_ricercaGenerica ID="Mod_ricercaGenerica1" runat="server" />
</div>
</div>
</div>
+35 -11
View File
@@ -2,12 +2,31 @@ using System;
public partial class MoonPro : System.Web.UI.MasterPage
{
protected void Page_Load(object sender, EventArgs e)
{
}
#region Protected Fields
protected string _headCssClass;
protected string _mainCssClass;
#endregion Protected Fields
#region Public Properties
/// <summary>
/// classe css area HEADER
/// </summary>
public string headCssClass
{
get
{
return _headCssClass;
}
set
{
_headCssClass = value;
}
}
/// <summary>
/// classe css area BODY
/// </summary>
@@ -23,20 +42,25 @@ public partial class MoonPro : System.Web.UI.MasterPage
}
}
protected string _headCssClass;
/// <summary>
/// classe css area HEADER
/// </summary>
public string headCssClass
public bool showSearch
{
get
{
return _headCssClass;
return Mod_ricercaGenerica1.Visible;
}
set
{
_headCssClass = value;
Mod_ricercaGenerica1.Visible = value;
}
}
#endregion Public Properties
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
+38 -38
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <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>
//------------------------------------------------------------------------------
@@ -13,101 +13,101 @@ public partial class MoonPro
{
/// <summary>
/// Controllo PlaceHolder1.
/// PlaceHolder1 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.PlaceHolder PlaceHolder1;
/// <summary>
/// Controllo BundleReference2.
/// BundleReference2 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference2;
/// <summary>
/// Controllo BundleReference1.
/// BundleReference1 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::Microsoft.AspNet.Web.Optimization.WebForms.BundleReference BundleReference1;
/// <summary>
/// Controllo form1.
/// form1 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.HtmlForm form1;
/// <summary>
/// Controllo ScriptManager1.
/// ScriptManager1 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.ScriptManager ScriptManager1;
/// <summary>
/// Controllo Mod_menuTop1.
/// Mod_menuTop1 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_menuTop Mod_menuTop1;
/// <summary>
/// Controllo UpdatePanel1.
/// UpdatePanel1 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.UpdatePanel UpdatePanel1;
/// <summary>
/// Controllo Mod_pageTitleAndSearch1.
/// Mod_pageTitleAndSearch1 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::mod_pageTitleAndSearch Mod_pageTitleAndSearch1;
/// <summary>
/// Controllo Mod_ricercaGenerica1.
/// Mod_ricercaGenerica1 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::mod_ricercaGenerica Mod_ricercaGenerica1;
/// <summary>
/// Controllo ContentPlaceHolder1.
/// ContentPlaceHolder1 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.ContentPlaceHolder ContentPlaceHolder1;
/// <summary>
/// Controllo mod_menuBottom.
/// mod_menuBottom 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_menuBottom mod_menuBottom;
}
+1 -1
View File
@@ -2,7 +2,7 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<html xmlns="http://www.w3.org/1999/xhtml" lang="it" xml:lang="it">
<head runat="server">
<title>Untitled Page</title>
<%--<link href="~/Style.css" rel="stylesheet" type="text/css" />
@@ -0,0 +1,66 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ImageArchive.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_ImageArchive" %>
<div class="bg-light my-1">
<div class="row py-0">
<div class="col-12 col-md-8">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Ricerca [ALT-T]</span>
</div>
<asp:TextBox runat="server" ID="txtSearchArt" CssClass="form-control" AutoPostBack="True" placeholder="ricerca per nome file" AccessKey="T" />
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtSearchReset" CssClass="input-group-text btn btn-block" OnClick="lbtSearchReset_Click"><i class="fa fa-times" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
<div class="col-6 col-md-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">col</span>
</div>
<asp:DropDownList runat="server" ID="ddlSize" AutoPostBack="true" CssClass="form-control" OnSelectedIndexChanged="ddlSize_SelectedIndexChanged">
<asp:ListItem Text="12" Value="col-1"></asp:ListItem>
<asp:ListItem Text="6" Value="col-2" Selected="true"></asp:ListItem>
<asp:ListItem Text="4" Value="col-3"></asp:ListItem>
<asp:ListItem Text="3" Value="col-4"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
<div class="col-6 col-md-2">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">show max</span>
</div>
<asp:DropDownList runat="server" ID="ddlMaxNum" AutoPostBack="true" CssClass="form-control" OnSelectedIndexChanged="ddlSize_SelectedIndexChanged">
<asp:ListItem Text="10" Value="10"></asp:ListItem>
<asp:ListItem Text="25" Value="25" Selected="true"></asp:ListItem>
<asp:ListItem Text="50" Value="50"></asp:ListItem>
<asp:ListItem Text="100" Value="100"></asp:ListItem>
<asp:ListItem Text="200" Value="200"></asp:ListItem>
<asp:ListItem Text="1000" Value="1000"></asp:ListItem>
</asp:DropDownList>
</div>
</div>
</div>
<div class="row">
<asp:Repeater runat="server" ID="repImages" DataSourceID="ods">
<ItemTemplate>
<div class='<%# ddlSize.SelectedValue + " text-center" %>'>
<asp:LinkButton runat="server" ID="lbtImage" OnClick="lbtImage_Click" CssClass="btn btn-block btn-outline-info text-dark my-1" CommandArgument='<%# Eval("name") %>'>
<b><%# Eval("name") %></b>
<asp:Image runat="server" ID="imgFile" CssClass="img-fluid" ImageUrl='<%# Eval("relPath") %>' AlternateText='<%# Eval("relPath") %>' />
</asp:LinkButton>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource runat="server" ID="ods" SelectMethod="ElencoFiles" TypeName="MP_ADM.WebUserControls.cmp_ImageArchive" OldValuesParameterFormatString="original_{0}">
<SelectParameters>
<asp:ControlParameter ControlID="hfPathFull" Name="dirPath" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="txtSearchArt" Name="searchVal" PropertyName="Text" Type="String" DefaultValue="*" />
<asp:ControlParameter ControlID="ddlMaxNum" Name="maxNum" PropertyName="SelectedValue" Type="Int32" DefaultValue="25" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfPathFull" />
<asp:HiddenField runat="server" ID="hfSelImage" />
</div>
</div>
@@ -0,0 +1,150 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_ImageArchive : BaseUserControl
{
#region Protected Fields
protected string imgPathShedaTecn = memLayer.ML.CRS("imgPathShedaTecn");
#endregion Protected Fields
#region Protected Properties
protected string PathFull
{
get
{
return hfPathFull.Value;
}
set
{
hfPathFull.Value = value;
}
}
#endregion Protected Properties
#region Public Properties
public string SearchVal
{
get
{
return txtSearchArt.Text.Trim();
}
set
{
txtSearchArt.Text = value;
}
}
public string selImage
{
get
{
return hfSelImage.Value;
}
set
{
hfSelImage.Value = value;
}
}
#endregion Public Properties
#region Private Methods
private void doUpdate()
{
repImages.DataBind();
}
#endregion Private Methods
#region Protected Methods
protected void ddlSize_SelectedIndexChanged(object sender, EventArgs e)
{
doUpdate();
}
protected void lbtImage_Click(object sender, EventArgs e)
{
// recupero nome immagine...
LinkButton lbt = (LinkButton)sender;
if (lbt != null)
{
selImage = lbt.CommandArgument;
}
raiseSelNew();
}
protected void lbtSearchReset_Click(object sender, EventArgs e)
{
txtSearchArt.Text = "";
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
PathFull = Server.MapPath(imgPathShedaTecn);
selImage = "";
}
}
#endregion Protected Methods
#region Public Methods
public List<FileData> ElencoFiles(string dirPath, string searchVal, int maxNum)
{
int currNum = 0;
List<FileData> answ = new List<FileData>();
try
{
searchVal = string.IsNullOrEmpty(searchVal) ? "*" : $"*{searchVal}*";
var tabFiles = Directory.GetFiles(dirPath, searchVal);
foreach (var item in tabFiles)
{
answ.Add(new FileData() { name = Path.GetFileName(item), relPath = $"{imgPathShedaTecn}{Path.GetFileName(item)}", fullPath = item });
currNum++;
// se superato max --> mi fermo
if (currNum >= maxNum)
{
break;
}
}
}
catch
{ }
return answ;
}
#endregion Public Methods
#region Public Classes
public class FileData
{
#region Public Properties
public string fullPath { get; set; } = "";
public string name { get; set; } = "";
public string relPath { get; set; } = "";
#endregion Public Properties
}
#endregion Public Classes
}
}
+89
View File
@@ -0,0 +1,89 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_ImageArchive
{
/// <summary>
/// Controllo txtSearchArt.
/// </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.TextBox txtSearchArt;
/// <summary>
/// Controllo lbtSearchReset.
/// </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 lbtSearchReset;
/// <summary>
/// Controllo ddlSize.
/// </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.DropDownList ddlSize;
/// <summary>
/// Controllo ddlMaxNum.
/// </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.DropDownList ddlMaxNum;
/// <summary>
/// Controllo repImages.
/// </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.Repeater repImages;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo hfPathFull.
/// </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.HiddenField hfPathFull;
/// <summary>
/// Controllo hfSelImage.
/// </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.HiddenField hfSelImage;
}
}
+190
View File
@@ -0,0 +1,190 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_PODL_OUT.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_PODL_OUT" %>
<%@ Register Src="~/WebUserControls/mod_newPromessaODL.ascx" TagPrefix="uc1" TagName="mod_newPromessaODL" %>
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-4">
<h4>PODL attivi</h4>
</div>
<%--<div class="col-2 text-right">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<asp:CheckBox runat="server" ID="chkUnassigned" AutoPostBack="True" OnCheckedChanged="chkUnassigned_CheckedChanged" Checked="true" />
</div>
</div>
<asp:Label runat="server" ID="lblUnass" CssClass="input-group-text small" Text="Mostra SOLO programmate" />
</div>
</div>--%>
<div class="col-4 text-right" runat="server" id="divMachine">
<div class="input-group">
<div class="input-group-prepend">
<div class="input-group-text">
<asp:CheckBox runat="server" ID="chkReassign" AutoPostBack="True" Checked="false" OnCheckedChanged="chkReassign_CheckedChanged" />
</div>
</div>
<asp:DropDownList runat="server" ID="ddlSelMacchina" CssClass="form-control" DataSourceID="odsMac" DataTextField="label" DataValueField="value" AppendDataBoundItems="true">
<asp:ListItem Text="-- Impianto Originale --" Value="" />
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsMac" OldValuesParameterFormatString="original_{0}" SelectMethod="getAttive" TypeName="MapoDb.DS_UtilityTableAdapters.v_selMacchineTableAdapter" FilterExpression=" Value NOT LIKE '%#%' "></asp:ObjectDataSource>
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtReassignMachine" class="btn btn-info" OnClick="lbtReassignMachine_Click"><i class="fa fa-edit" aria-hidden="true"></i> Riassegna</asp:LinkButton>
</div>
</div>
</div>
<div class="col-4" runat="server" id="divActions">
<div class="row">
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtAttiva" class="btn btn-primary btn-block" OnClick="lbtAttiva_Click"><i class="fa fa-check-square-o" aria-hidden="true"></i> Attiva</asp:LinkButton>
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtDisattiva" class="btn btn-secondary btn-block" OnClick="lbtDisattiva_Click"><i class="fa fa-square-o" aria-hidden="true"></i> Disattiva</asp:LinkButton>
</div>
<div class="col-4">
<asp:LinkButton runat="server" ID="lbtElimina" class="btn btn-danger btn-block" OnClick="lbtElimina_Click"><i class="fa fa-trash" aria-hidden="true"></i> Elimina</asp:LinkButton>
</div>
</div>
</div>
</div>
</div>
<div class="card-body">
<asp:GridView ID="grView" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" PageSize="25" DataKeyNames="IdxPromessa" DataSourceID="ods" CssClass="table table-striped table-sm my-0">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<SelectedRowStyle CssClass="table-primary" />
<EmptyDataTemplate>
<asp:Label runat="server" ID="lblNoRecord" Text='<%# traduci("noRecord") %>' />
</EmptyDataTemplate>
<Columns>
<asp:TemplateField>
<HeaderTemplate>
<asp:CheckBox ID="btnSelAll" runat="server" Checked="false" ToolTip='<%# traduci("btnSelAll") %>'
OnCheckedChanged="btnSelAll_Click" CssClass="btn btn-default btn-sm" AutoPostBack="true"></asp:CheckBox>
</HeaderTemplate>
<ItemTemplate>
<asp:CheckBox ID="chkSelect" CssClass="btn btn-default btn-sm" runat="server" OnCheckedChanged="chkSelect_CheckedChanged" AutoPostBack="true" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="KeyRichiesta" SortExpression="KeyRichiesta">
<ItemTemplate>
<div class="row">
<div class="col-12 font-weight-bold">
<asp:Label ID="lblKeyRichiesta" runat="server" Text='<%# Eval("KeyRichiesta") %>' CssClass='<%# cssByAtt(Eval("Attivabile")) %>' />
</div>
<div class="col-12 small">
<asp:Label ID="lblIdxPromessa" runat="server" Text='<%# Eval("idxPromessa") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="DescrGruppo" HeaderText="Fase" SortExpression="DescrGruppo" ItemStyle-CssClass="text-nowrap">
<ItemStyle CssClass="text-nowrap"></ItemStyle>
</asp:BoundField>
<asp:BoundField DataField="DescrMacc" HeaderText="Macchina" SortExpression="DescrMacc" />
<asp:BoundField DataField="DescCliente" HeaderText="Cliente" SortExpression="DescCliente" />
<asp:TemplateField HeaderText="Articolo" SortExpression="CodArticolo">
<ItemTemplate>
<div class="row">
<div class="col-6 font-weight-bold">
<asp:Label ID="lblDisegno" runat="server" Text='<%# Eval("Disegno") %>' CssClass='<%# cssByAtt(Eval("Attivabile")) %>' />
</div>
<div class="col-6 text-right">
cod.
<asp:Label ID="lblCodArticolo" runat="server" Text='<%# Eval("CodArticolo") %>' />
</div>
<div class="col-12 small">
<asp:Label ID="lblDescArticolo" runat="server" Text='<%# Eval("DescArticolo") %>' />
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="# Pezzi" SortExpression="NumPezzi">
<ItemTemplate>
<b>
<asp:Label runat="server" ID="lblNumPezzi" CssClass='<%# cssByAtt(Eval("Attivabile")) %>' Text='<%# Eval("NumPezzi") %>' /></b>
</ItemTemplate>
<HeaderStyle HorizontalAlign="Right" />
<ItemStyle HorizontalAlign="Right" />
</asp:TemplateField>
<asp:TemplateField HeaderText="Due Date" SortExpression="DueDate">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DueDate") %>' CssClass='<%# cssDueDate(Eval("DueDate")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="ODL" SortExpression="IdxOdl">
<ItemTemplate>
<asp:Label runat="server" ID="lblIdxOdl" Text='<%# Eval("IdxOdl") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ord" SortExpression="Priorita" ItemStyle-HorizontalAlign="center">
<ItemTemplate>
<asp:Label runat="server" ID="txtPriorita" Text='<%# Eval("Priorita") %>' CssClass="font-weight-bold" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<div class="d-flex">
<div class="mr-auto p-2">
<div class="btn-group">
<asp:LinkButton runat="server" ID="lnkMoveDown" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), -1) %>' ToolTip="Diminuisci (ritarda)" OnClick="lnkMoveDown_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-dark"><i class="fa fa-arrow-down" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNoneDx" Enabled="false" Visible='<%# !checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), -1) %>' CssClass="btn btn-sm text-light"><i class="fa fa-arrows-h" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtNoneSx" Enabled="false" Visible='<%# !checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), 1) %>' CssClass="btn btn-sm text-light"><i class="fa fa-arrows-h" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lnkMoveUp" Visible='<%# checkChgPrio(Eval("IdxMacchina").ToString(), Eval("Priorita").ToString(), 1) %>' ToolTip="Aumenta (anticipa)" OnClick="lnkMoveUp_Click" CausesValidation="False" CommandArgument='<%# Eval("IdxPromessa") %>' CssClass="btn btn-sm btn-secondary"><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Attiva" SortExpression="Attivabile" ItemStyle-HorizontalAlign="center">
<ItemTemplate>
<asp:CheckBox runat="server" ID="chkAttiva" Checked='<%# Eval("Attivabile") %>' Enabled="false" CssClass='<%# cssByAtt(Eval("Attivabile")) %>' />
</ItemTemplate>
</asp:TemplateField>
<%--<asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("IdxPromessa") %>' OnClientClick="return confirm('Sicuro di voler procedere con eliminazione?');" OnClick="lbtDel_Click" ToolTip='<%# traduci("Delete") %>' Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash"></i></asp:LinkButton>
</ItemTemplate>
<HeaderStyle HorizontalAlign="Center"></HeaderStyle>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>--%>
</Columns>
</asp:GridView>
<asp:HiddenField runat="server" ID="hfIdxMacc" />
<asp:HiddenField runat="server" ID="hfCodGrp" />
<asp:HiddenField runat="server" ID="hfCodArt" />
<asp:HiddenField runat="server" ID="hfCodCli" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByMaccArt" TypeName="MapoDb.DS_PlanTableAdapters.PromesseOUTTableAdapter" FilterExpression=" ( CodArticolo LIKE '%{0}%' OR DescArticolo LIKE '%{0}%' ) " DeleteMethod="deleteQuery">
<FilterParameters>
<asp:SessionParameter DefaultValue="*" Name="ricerca" SessionField="valoreCercato" />
</FilterParameters>
<DeleteParameters>
<asp:Parameter Name="Original_idxPromessa" Type="Int32" />
</DeleteParameters>
<SelectParameters>
<asp:ControlParameter ControlID="hfCodGrp" DefaultValue="*" Name="CodGruppo" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfCodArt" DefaultValue="*" Name="CodArticolo" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfIdxMacc" DefaultValue="*" Name="IdxMacchina" PropertyName="Value" Type="String" />
<asp:ControlParameter ControlID="hfCodCli" DefaultValue="*" Name="CodCliente" PropertyName="Value" Type="String" />
<asp:Parameter Name="onlyFree" Type="Boolean" DefaultValue="true" />
<%--<asp:ControlParameter ControlID="chkUnassigned" Name="onlyFree" PropertyName="Checked" Type="Boolean" />--%>
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="card-footer">
<div class="row">
<div class="col"></div>
<div class="col text-center">
<asp:Label ID="lblNumRec" runat="server" CssClass="txtMini" />&nbsp;&nbsp;
<asp:Label ID="lblWarning" runat="server" Visible="false" CssClass="erroreMid" />
</div>
<div class="col text-right">
mostra:
<asp:TextBox runat="server" ID="txtPageSize" Text="10" Width="2em" OnTextChanged="txtPageSize_TextChanged" />
</div>
</div>
</div>
</div>
+462
View File
@@ -0,0 +1,462 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_PODL_OUT : BaseUserControl
{
#region Protected Fields
protected string _idxGridView;
#endregion Protected Fields
#region Public Fields
/// <summary>
/// Determina se sia solo readonly il controllo...
/// </summary>
public bool readOnly;
#endregion Public Fields
#region Public Properties
/// <summary>
/// CodArt filtrato
/// </summary>
public string CodArticolo
{
get
{
return hfCodArt.Value;
}
set
{
hfCodArt.Value = value;
}
}
/// <summary>
/// Chiave PRE selezione tipo richiesta ordine
/// </summary>
public string CodCliente
{
get
{
return hfCodCli.Value;
}
set
{
hfCodCli.Value = value;
}
}
/// <summary>
/// Gruppo selezionato
/// </summary>
public string CodGruppo
{
get
{
return hfCodGrp.Value;
}
set
{
hfCodGrp.Value = value;
}
}
/// <summary>
/// IdxMacchina filtrata
/// </summary>
public string IdxMacchinaFilt
{
get
{
return hfIdxMacc.Value;
}
set
{
hfIdxMacc.Value = value;
}
}
/// <summary>
/// dimensione pagina
/// </summary>
public int pageSize
{
get
{
int answ = 10;
try
{
answ = Convert.ToInt32(txtPageSize.Text);
}
catch
{ }
return answ;
}
set
{
txtPageSize.Text = value.ToString();
}
}
#endregion Public Properties
#region Private Methods
private void checkActions()
{
// calcolo visibilità (almeno 1 selezionato)
bool showActions = false;
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked && ((CheckBox)riga.FindControl("chkSelect")).Visible)
{
showActions = true;
}
if (showActions)
{
break;
}
}
divActions.Visible = showActions;
divMachine.Visible = showActions;
}
private void fixSetMachine()
{
ddlSelMacchina.Enabled = chkReassign.Checked;
lbtReassignMachine.Visible = chkReassign.Checked;
if (!chkReassign.Checked)
{
ddlSelMacchina.SelectedIndex = 0;
}
}
/// <summary>
/// Imposta Promesse selezionate come attivabili secondo richiesta
/// </summary>
/// <param name="isAttivabile"></param>
private void setPromAttivabili(bool isAttivabile)
{
int IdxPromessa = 0;
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked && ((CheckBox)riga.FindControl("chkSelect")).Visible)
{
int.TryParse(((Label)riga.FindControl("lblIdxPromessa")).Text, out IdxPromessa);
// disattivo!
DataLayerObj.taPromOut.updAttiva(IdxPromessa, isAttivabile);
}
}
updateGrView();
}
/// <summary>
/// Aggiorno Gridview
/// </summary>
private void updateGrView()
{
grView.DataBind();
checkActions();
raiseNewVal();
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// reset della selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnReset_Click(object sender, EventArgs e)
{
resetSelezione();
}
/// <summary>
/// seleziona/deseleziona le righe indicate...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnSelAll_Click(object sender, EventArgs e)
{
// seleziono tutti i valori visibili nel datagrid
CheckBox chkbox = ((CheckBox)sender);
bool isChecked = chkbox.Checked;
if (!isChecked)
{
chkbox.ToolTip = traduci("btnSelAll");
}
else
{
chkbox.ToolTip = traduci("btnDeselAll");
}
foreach (GridViewRow riga in grView.Rows)
{
((CheckBox)riga.FindControl("chkSelect")).Checked = isChecked;
}
checkActions();
}
protected void chkReassign_CheckedChanged(object sender, EventArgs e)
{
fixSetMachine();
}
protected void chkSelect_CheckedChanged(object sender, EventArgs e)
{
checkActions();
}
protected void chkUnassigned_CheckedChanged(object sender, EventArgs e)
{
updateGrView();
}
/// <summary>
/// elenco colonne del datagrid
/// </summary>
/// <returns></returns>
protected DataColumnCollection colonneObj()
{
MapoDb.DS_ProdTempi.ODLDataTable tabella = new MapoDb.DS_ProdTempi.ODLDataTable();
DataColumnCollection colonne = tabella.Columns;
return colonne;
}
/// <summary>
/// salvo comando
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbt_Command(object sender, CommandEventArgs e)
{
memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument);
}
protected void lbtAttiva_Click(object sender, EventArgs e)
{
setPromAttivabili(true);
}
protected void lbtDisattiva_Click(object sender, EventArgs e)
{
setPromAttivabili(false);
}
protected void lbtElimina_Click(object sender, EventArgs e)
{
int IdxPromessa = 0;
int IdxOdl = 0;
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked && ((CheckBox)riga.FindControl("chkSelect")).Visible)
{
int.TryParse(((Label)riga.FindControl("lblIdxOdl")).Text, out IdxOdl);
if (IdxOdl == 0)
{
int.TryParse(((Label)riga.FindControl("lblIdxPromessa")).Text, out IdxPromessa);
// ELIMINO!
DataLayerObj.taPromOut.deleteQuery(IdxPromessa);
}
}
}
updateGrView();
}
protected void lbtReassignMachine_Click(object sender, EventArgs e)
{
int IdxPromessa = 0;
int IdxOdl = 0;
string idxMacchina2Reass = ddlSelMacchina.SelectedValue;
if (!string.IsNullOrEmpty(idxMacchina2Reass))
{
foreach (GridViewRow riga in grView.Rows)
{
if (((CheckBox)riga.FindControl("chkSelect")).Checked && ((CheckBox)riga.FindControl("chkSelect")).Visible)
{
int.TryParse(((Label)riga.FindControl("lblIdxOdl")).Text, out IdxOdl);
if (IdxOdl == 0)
{
int.TryParse(((Label)riga.FindControl("lblIdxPromessa")).Text, out IdxPromessa);
// riassegno!
DataLayerObj.taPromOut.updMacchina(IdxPromessa, idxMacchina2Reass);
}
}
}
}
updateGrView();
}
/// <summary>
/// Richiesto abbassamento priorità = RITARDA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkMoveDown_Click(object sender, EventArgs e)
{
LinkButton lb = (LinkButton)sender;
// imposto articolo, splittando
int IdxPromessa = 0;
int.TryParse(lb.CommandArgument, out IdxPromessa);
// chiamo stored
DataLayerObj.taPromOut.movePrio(IdxPromessa, -1);
//update!
updateGrView();
}
/// <summary>
/// Richiesto aumento priorità = ANTICIPA
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lnkMoveUp_Click(object sender, EventArgs e)
{
LinkButton lb = (LinkButton)sender;
// imposto articolo, splittando
int IdxPromessa = 0;
int.TryParse(lb.CommandArgument, out IdxPromessa);
// chiamo stored
DataLayerObj.taPromOut.movePrio(IdxPromessa, 1);
//update!
updateGrView();
}
/// <summary>
/// inizializzazione valori di default
/// </summary>
/// <param name="e"></param>
protected override void OnInit(EventArgs e)
{
base.OnInit(e);
_idxGridView = "IdxPromessa";
fixSetMachine();
}
protected override void OnLoad(EventArgs e)
{
base.OnLoad(e);
if (!Page.IsPostBack)
{
grView.PageSize = pageSize;
divActions.Visible = false;
divMachine.Visible = false;
}
}
/// <summary>
/// cambio dim pagina
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void txtPageSize_TextChanged(object sender, EventArgs e)
{
grView.PageSize = pageSize;
}
#endregion Protected Methods
#region Public Methods
/// <summary>
/// Verifica se sia permesso cambio priorità (NON può andare a 0 ne oltre il max x macchina)
/// </summary>
/// <param name="IdxMacchina"></param>
/// <param name="priorStr"></param>
/// <param name="delta"></param>
/// <returns></returns>
public bool checkChgPrio(string IdxMacchina, string priorStr, int delta)
{
bool enableChgPrio = false;
int priorita = 0;
int.TryParse(priorStr, out priorita);
// calcolo i limiti priorità x macchina (0 --> max x macchina)... LPI/LPS liminte priorità inferiore / superiore
int LPI = 1;
int LPS = 1;
var tabella = DataLayerObj.taPromOut.getMaxPrioByMacc(IdxMacchina, true);
if (tabella.Rows.Count > 0)
{
LPS = tabella[0].Priorita;
}
// è ok SE sono ENTRO i 2 limiti
enableChgPrio = ((priorita + delta) >= LPI && (priorita + delta) <= LPS);
bool singleMachine = !string.IsNullOrEmpty(IdxMacchinaFilt) && IdxMacchinaFilt == IdxMacchina;
#if false
bool onlyProgrammed = chkUnassigned.Checked;
return enableChgPrio && onlyProgrammed && singleMachine;
#endif
return enableChgPrio && singleMachine;
}
public string cssByAtt(object currAtt)
{
string answ = "";
bool attivabile = false;
bool.TryParse($"{currAtt}", out attivabile);
answ = attivabile ? "text-primary" : "text-secondary";
return answ;
}
public bool delEnabled(object _idxOdl)
{
bool answ = false;
int idxOdl = 0;
// controllo non sia già stata iniziata la produzione sennò non posso cancellare...
try
{
idxOdl = Convert.ToInt32(_idxOdl);
answ = (DataLayerObj.taODL.getByIdx(idxOdl, true).Count > 0);
}
catch
{ }
return answ;
}
public void doUpdate()
{
grView.DataBind();
checkActions();
}
/// <summary>
/// formatot url x stampa ODL
/// </summary>
/// <param name="idx"></param>
/// <returns></returns>
public string formattaUrlOdl(object idx)
{
string answ = String.Format(memLayer.ML.CRS("exportFormat1"), Convert.ToInt32(reportRichiesto.SchedaODL), idx);
return answ;
}
/// <summary>
/// resetta la selezione dei valori in caso di modifiche su altri controlli
/// </summary>
public void resetSelezione()
{
divActions.Visible = false;
divMachine.Visible = false;
memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView));
grView.SelectedIndex = -1;
grView.DataBind();
lblWarning.Visible = false;
raiseReset();
}
#endregion Public Methods
}
}
+179
View File
@@ -0,0 +1,179 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_PODL_OUT
{
/// <summary>
/// divMachine control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divMachine;
/// <summary>
/// chkReassign control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkReassign;
/// <summary>
/// ddlSelMacchina control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlSelMacchina;
/// <summary>
/// odsMac control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsMac;
/// <summary>
/// lbtReassignMachine control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtReassignMachine;
/// <summary>
/// divActions control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divActions;
/// <summary>
/// lbtAttiva control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtAttiva;
/// <summary>
/// lbtDisattiva control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtDisattiva;
/// <summary>
/// lbtElimina control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtElimina;
/// <summary>
/// grView control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// hfIdxMacc control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfIdxMacc;
/// <summary>
/// hfCodGrp control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodGrp;
/// <summary>
/// hfCodArt control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodArt;
/// <summary>
/// hfCodCli control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCodCli;
/// <summary>
/// ods control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// lblNumRec control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNumRec;
/// <summary>
/// lblWarning control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblWarning;
/// <summary>
/// txtPageSize control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.TextBox txtPageSize;
}
}
+24
View File
@@ -0,0 +1,24 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_detail.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_ST_detail" %>
<%@ Register Src="~/WebUserControls/cmp_ST_objView.ascx" TagPrefix="uc1" TagName="cmp_ST_objView" %>
<asp:Repeater ID="repDetail" runat="server" DataSourceID="ods">
<ItemTemplate>
<div class="border border-bottom-secondary">
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
</div>
</ItemTemplate>
<AlternatingItemTemplate>
<div class="">
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
</div>
</AlternatingItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByGrpIdxST" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_ActualRowTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxST" DefaultValue="0" Name="IdxST" PropertyName="Value" Type="Int32" />
<asp:ControlParameter ControlID="hfCodGruppo" DefaultValue="ART" Name="CodGruppo" PropertyName="Value" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfCodGruppo" Value="" />
<asp:HiddenField runat="server" ID="hfIdxST" Value="0" />
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_ST_detail : BaseUserControl
{
#region Public Properties
public string CodGruppo
{
get
{
return hfCodGruppo.Value.Trim();
}
set
{
hfCodGruppo.Value = value.Trim();
}
}
public int IdxST
{
get
{
int answ = 0;
int.TryParse(hfIdxST.Value, out answ);
return answ;
}
set
{
hfIdxST.Value = $"{value}";
}
}
#endregion Public Properties
#region Private Methods
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
}
+53
View File
@@ -0,0 +1,53 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_ST_detail
{
/// <summary>
/// Controllo repDetail.
/// </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.Repeater repDetail;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo hfCodGruppo.
/// </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.HiddenField hfCodGruppo;
/// <summary>
/// Controllo hfIdxST.
/// </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.HiddenField hfIdxST;
}
}
@@ -0,0 +1,24 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objView.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_ST_objView" %>
<asp:HiddenField runat="server" ID="hfType" />
<asp:HiddenField runat="server" ID="hfLabel" />
<asp:HiddenField runat="server" ID="hfValue" />
<asp:HiddenField runat="server" ID="hfRequired" />
<asp:HiddenField runat="server" ID="hfExtCode" />
<div runat="server" id="divTxt" class="row">
<div class="col-4 pr-0 text-left">
<%: hfLabel.Value %>
</div>
<div class='<%: "col-8 pl-0 text-right font-weight-bold" + dataCss %>'>
<%: hfValue.Value %>
<asp:Label runat="server" ID="lblError"><i class="fa fa-exclamation-triangle" aria-hidden="true" ></i></asp:Label>
<asp:Label runat="server" ID="lblChecked"><i class="fa fa-check-square-o" aria-hidden="true" ></i></asp:Label>
</div>
</div>
<div runat="server" id="divImg" class="row">
<div class="col-4 pr-0 text-left">
<%: hfLabel.Value %>
</div>
<div class="col-8 pl-0 text-right">
<asp:Image runat="server" ID="imgData" CssClass="img-fluid" ImageUrl='<%# imageUrl %>' Height="128px" />
</div>
</div>
@@ -0,0 +1,189 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_ST_objView : BaseUserControl
{
#region Public Properties
public string dataCss
{
get
{
string answ = "";
if (required)
{
if (dataValue != extCode)
{
answ = " text-danger";
}
else
{
answ = " text-success";
}
}
return answ;
}
}
public string dataLabel
{
get
{
return hfLabel.Value.Trim();
}
set
{
hfLabel.Value = value.Trim();
}
}
public string dataType
{
get
{
return hfType.Value.Trim();
}
set
{
hfType.Value = value.Trim();
fixDisplay();
}
}
public string dataValue
{
get
{
return hfValue.Value.Trim();
}
set
{
hfValue.Value = value.Trim();
}
}
public string extCode
{
get
{
return hfExtCode.Value.Trim();
}
set
{
hfExtCode.Value = value.Trim();
fixDisplay();
}
}
/// <summary>
/// Url immagine SE richiesta
/// </summary>
public string imageUrl
{
get
{
string imgPath = "";
string fullPath = "";
//check type...
if (dataType == "IMG")
{
imgPath = dataValue;
if (!Path.IsPathRooted(imgPath))
{
// aggiungo base path
imgPath = $"~\\images\\ST_img\\{imgPath}";
}
fullPath = Server.MapPath(imgPath);
// verifico esistenza file...
if (!File.Exists(fullPath))
{
// metto segnaposto empty
imgPath = "~\\images\\ST_img\\Steamware.png";
}
}
return imgPath;
}
}
public bool required
{
get
{
bool answ = false;
bool.TryParse(hfRequired.Value.Trim(), out answ);
return answ;
}
set
{
hfRequired.Value = value.ToString();
fixDisplay();
}
}
public bool showCheckedData
{
get
{
bool answ = false;
if (required && (dataValue == extCode))
{
answ = true;
}
return answ;
}
}
public bool showMissingData
{
get
{
bool answ = false;
if (required && (dataValue != extCode))
{
answ = true;
}
return answ;
}
}
#endregion Public Properties
#region Private Methods
private void fixDisplay()
{
divImg.Visible = false;
divTxt.Visible = false;
switch (dataType)
{
case "IMG":
divImg.Visible = true;
break;
case "TXT":
default:
divTxt.Visible = true;
break;
}
lblError.Visible = showMissingData;
lblChecked.Visible = showCheckedData;
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
}
+107
View File
@@ -0,0 +1,107 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_ST_objView
{
/// <summary>
/// Controllo hfType.
/// </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.HiddenField hfType;
/// <summary>
/// Controllo hfLabel.
/// </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.HiddenField hfLabel;
/// <summary>
/// Controllo hfValue.
/// </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.HiddenField hfValue;
/// <summary>
/// Controllo hfRequired.
/// </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.HiddenField hfRequired;
/// <summary>
/// Controllo hfExtCode.
/// </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.HiddenField hfExtCode;
/// <summary>
/// Controllo divTxt.
/// </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 divTxt;
/// <summary>
/// Controllo lblError.
/// </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.Label lblError;
/// <summary>
/// Controllo lblChecked.
/// </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.Label lblChecked;
/// <summary>
/// Controllo divImg.
/// </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 divImg;
/// <summary>
/// Controllo imgData.
/// </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.Image imgData;
}
}
@@ -0,0 +1,46 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_preview.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_ST_preview" %>
<%@ Register Src="~/WebUserControls/cmp_ST_detail.ascx" TagPrefix="uc1" TagName="cmp_ST_detail" %>
<div class="card text-dark textCondens">
<div class="card-header bg-info text-light">
<div class="row">
<div class="col-6">
<h4>Scheda Tecnica Articolo</h4>
</div>
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtPaste" CssClass="btn btn-block btn-outline-light" OnClick="lbtPaste_Click">
<i class="fa fa-clone" aria-hidden="true"></i> PASTE
</asp:LinkButton>
</div>
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtCopy" CssClass="btn btn-block btn-outline-light" OnClick="lbtCopy_Click">
<i class="fa fa-clone" aria-hidden="true"></i> COPY
</asp:LinkButton>
</div>
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtDoEdit" CssClass="btn btn-block btn-light" OnClick="lbtDoEdit_Click"><i class="fa fa-pencil" aria-hidden="true"></i> Modifica Scheda</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body py-1">
<div class="row">
<asp:Repeater ID="repGroup" runat="server" DataSourceID="odsGroup">
<ItemTemplate>
<div class="col-lg-6 col-12 p-1">
<div class="card">
<div class="card-header">
<b>
<asp:Label ID="DescGruppoLabel" runat="server" Text='<%# Eval("DescGruppo") %>' /></b>
</div>
<div class="card-body p-0">
<uc1:cmp_ST_detail runat="server" ID="cmp_ST_detail" CodGruppo='<%# Eval("CodGruppo") %>' IdxST='<%# IdxST %>' />
</div>
</div>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
<asp:ObjectDataSource ID="odsGroup" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_AnagGruppiTableAdapter"></asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfIdxST" Value="0" />
</div>
</div>
@@ -0,0 +1,139 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_ST_preview : BaseUserControl
{
#region Protected Fields
protected string preClip = "IdxST:";
#endregion Protected Fields
#region Protected Properties
protected int clipbIdxST
{
get
{
int answ = 0;
if (!string.IsNullOrEmpty(clipboard))
{
int.TryParse(clipboard.Replace(preClip, ""), out answ);
}
return answ;
}
}
#endregion Protected Properties
#region Public Properties
public int IdxST
{
get
{
int answ = 0;
int.TryParse(hfIdxST.Value, out answ);
return answ;
}
set
{
hfIdxST.Value = $"{value}";
repGroup.DataBind();
checkClipboard();
}
}
#endregion Public Properties
#region Private Methods
private void checkClipboard()
{
// Tabella ST selezionata
var tabCurrSTAR = DataLayerObj.taSTAR.getByST(IdxST);
bool showPaste = false;
bool checkSource = false;
bool checkDest = false;
// verifico condizioni COPY
lbtCopy.Visible = (tabCurrSTAR.Rows.Count > 0);
// verifico condizioni PASTE
if (!string.IsNullOrEmpty(clipboard))
{
// verifico sia tipo clipboard valida
if (clipboard.StartsWith(preClip))
{
//verifico sia intero valido
if (clipbIdxST > 0)
{
// verifico le condizioni: si parte da una una ST esistente...
var tabSrcSTA = DataLayerObj.taSTA.getByKey(clipbIdxST);
checkSource = tabSrcSTA.Rows.Count > 0;
checkDest = tabCurrSTAR.Rows.Count == 0;
// verifica status visibilità x PASTE
showPaste = checkSource && checkDest;
}
}
}
// verifica x stile copy
lbtCopy.CssClass = checkSource ? "btn btn-block btn-light border border-dark" : "btn btn-block btn-outline-light";
lbtPaste.Visible = showPaste;
}
#endregion Private Methods
#region Protected Methods
protected void lbtCopy_Click(object sender, EventArgs e)
{
// salvo il clipboard la ST corrente...
clipboard = $"{preClip}{IdxST}";
checkClipboard();
}
protected void lbtDoEdit_Click(object sender, EventArgs e)
{
raiseNewVal();
}
/// <summary>
/// Effettua paste --> duplicazione Scheda Tecnica
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtPaste_Click(object sender, EventArgs e)
{
// verifico codici...
if (clipbIdxST > 0 && IdxST > 0)
{
// se diversi...
if (clipbIdxST != IdxST)
{
// effettuo chiamata copy/paste
DataLayerObj.taSTAR.PasteAll(clipbIdxST, IdxST);
}
clipboard = "";
}
raiseReset();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
clipboard = "";
string testo = traduci("ConfirmPasteFullST");
lbtPaste.OnClientClick = SteamWare.jsUtils.getCBE(testo, false);
}
checkClipboard();
}
#endregion Protected Methods
}
}
+71
View File
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_ST_preview
{
/// <summary>
/// Controllo lbtPaste.
/// </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 lbtPaste;
/// <summary>
/// Controllo lbtCopy.
/// </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 lbtCopy;
/// <summary>
/// Controllo lbtDoEdit.
/// </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 lbtDoEdit;
/// <summary>
/// Controllo repGroup.
/// </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.Repeater repGroup;
/// <summary>
/// Controllo odsGroup.
/// </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.ObjectDataSource odsGroup;
/// <summary>
/// Controllo hfIdxST.
/// </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.HiddenField hfIdxST;
}
}
@@ -0,0 +1,82 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_TechSheetArt.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_TechSheetArt" %>
<%@ Register Src="~/WebUserControls/cmp_TechSheetArtAddNew.ascx" TagPrefix="uc1" TagName="cmp_TechSheetArtAddNew" %>
<div class="row bgLightGrayUp py-1">
<div class="col-12 mb-1">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Schede [ALT-T]</span>
</div>
<asp:TextBox runat="server" ID="txtSearchArt" CssClass="form-control" AutoPostBack="True" OnTextChanged="txtSearchArt_TextChanged" placeholder="Codice Articolo / Descrizione" AccessKey="T" />
<div class="input-group-append">
<asp:LinkButton runat="server" ID="lbtSearchReset" CssClass="input-group-text btn btn-block" OnClick="lbtSearchReset_Click"><i class="fa fa-times" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</div>
<div class="col-6">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text">Tipologia</span>
</div>
<asp:DropDownList runat="server" ID="ddlTipo" DataSourceID="odsTipo" CssClass="form-control" DataTextField="DescTempl" DataValueField="CodTempl" AppendDataBoundItems="True" AutoPostBack="true" OnSelectedIndexChanged="ddlTipo_SelectedIndexChanged">
<asp:ListItem Text="--- Mostra Tutto ---" Value="ALL"></asp:ListItem>
</asp:DropDownList>
<asp:ObjectDataSource runat="server" ID="odsTipo" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_TemplateTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="col-6">
<asp:LinkButton runat="server" ID="lbtAddNew" CssClass="btn btn-block btn-primary" OnClick="lbtAddNew_Click">Nuova Scheda <i class="fa fa-caret-down" aria-hidden="true"></i> <i class="fa fa-caret-up" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtApprove" CssClass="btn btn-block btn-success" OnClick="lbtApprove_Click">Approva <i class="fa fa-certificate" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
<div class="row table-primary">
<div class="col-12">
<uc1:cmp_TechSheetArtAddNew runat="server" ID="cmp_TechSheetArtAddNew" />
</div>
</div>
<div class="row bgLightGrayDown">
<div class="col-12">
<asp:GridView runat="server" ID="grView" AutoGenerateColumns="False" DataKeyNames="IdxST" DataSourceID="ods" CssClass="table table-sm table-striped" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged">
<EditRowStyle CssClass="table-info" />
<SelectedRowStyle CssClass="table-info" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<EmptyDataTemplate>
Nessun record trovato
</EmptyDataTemplate>
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<asp:LinkButton ID="lbtReset" runat="server" OnClick="lbtReset_Click" CssClass="btn btn-sm btn-primary" Visible="true" ToolTip="Reset"><i class="fa fa-refresh"></i></asp:LinkButton>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbtSel" runat="server" CausesValidation="False" CommandName="Select" CssClass="btn btn-sm btn-primary"><i class="fa fa-search" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="IdxST" HeaderText="#" InsertVisible="False" ReadOnly="True" SortExpression="IdxST" />
<%--<asp:BoundField DataField="CodTempl" HeaderText="CodTempl" SortExpression="CodTempl" />--%>
<asp:BoundField DataField="CodArticolo" HeaderText="Art" SortExpression="CodArticolo" />
<asp:BoundField DataField="DescArticolo" HeaderText="Descr." SortExpression="CodArticolo" />
<%--<asp:BoundField DataField="MatrOpr" HeaderText="MatrOpr" SortExpression="MatrOpr" />
<asp:BoundField DataField="DtMod" HeaderText="DtMod" SortExpression="DtMod" />--%>
<asp:BoundField DataField="DescTempl" HeaderText="Tipo" SortExpression="DescTempl" ItemStyle-CssClass="text-nowrap" />
<asp:TemplateField HeaderText="Appr" SortExpression="IsValidated" ItemStyle-CssClass="text-center">
<ItemTemplate>
<asp:Label ID="lblValid" runat="server" Visible='<%# getBool(Eval("IsValidated")) %>' CssClass="text-success" ToolTip='<%# "Approvato: " + Eval("UserLogin") +" "+ Eval("DtMod") %>'><i class="fa fa-certificate" aria-hidden="true"></i></asp:Label>
<asp:Label ID="lblUnvalidated" runat="server" Visible='<%# !getBool(Eval("IsValidated")) %>' CssClass="text-danger" ToolTip='<%# "Ultima modifica: " + Eval("UserLogin") +" "+ Eval("DtMod") %>'><i class="fa fa-ban" aria-hidden="true"></i></asp:Label>
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" Visible='<%# DelEnabled(Eval("NumRow")) %>' CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmDelete") %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getBySearchArt" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_ActualTableAdapter" DeleteMethod="DeleteQuery">
<DeleteParameters>
<asp:Parameter Name="Original_IdxST" Type="Int32" />
</DeleteParameters>
<SelectParameters>
<asp:ControlParameter ControlID="txtSearchArt" DefaultValue="" Name="SearchCodArt" PropertyName="Text" Type="String" />
<asp:ControlParameter ControlID="ddlTipo" DefaultValue="ALL" Name="CodTempl" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
@@ -0,0 +1,151 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_TechSheetArt : BaseUserControl
{
#region Public Properties
public int IdxStSel
{
get
{
int answ = 0;
if (grView.SelectedIndex >= 0)
{
int.TryParse($"{grView.SelectedValue}", out answ);
}
return answ;
}
}
#endregion Public Properties
#region Private Methods
private void checkVisibility()
{
bool selected = grView.SelectedIndex >= 0;
lbtAddNew.Visible = !selected;
lbtApprove.Visible = selected;
// se selezionato --> verifico stato
if (selected)
{
bool doShow = false;
var tabSTA = DataLayerObj.taSTA.getByKey(IdxStSel);
if (tabSTA.Rows.Count > 0)
{
doShow = !tabSTA[0].IsValidated;
}
// controllo ANCHE che NON sia stato già approvato...
lbtApprove.Visible = doShow;
}
}
private void Cmp_TechSheetArtAddNew_eh_nuovoValore(object sender, EventArgs e)
{
resetSelezione();
checkVisibility();
}
#endregion Private Methods
#region Protected Methods
protected void ddlTipo_SelectedIndexChanged(object sender, EventArgs e)
{
// imposto sul componente addNew tranne il valore ALL didefault...
cmp_TechSheetArtAddNew.CodTempl = ddlTipo.SelectedValue == "ALL" ? "" : ddlTipo.SelectedValue;
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
raiseSelNew();
checkVisibility();
}
/// <summary>
/// RIchiesta nuova scheda
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtAddNew_Click(object sender, EventArgs e)
{
cmp_TechSheetArtAddNew.Visible = !cmp_TechSheetArtAddNew.Visible;
}
/// <summary>
/// /esegue salvataggio validazione scheda tecnica
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtApprove_Click(object sender, EventArgs e)
{
DataLayerObj.taSTA.updateValid(IdxStSel, true, user_std.UtSn.userNameAD);
grView.DataBind();
checkVisibility();
raiseSelNew();
}
/// <summary>
/// comando reset
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtReset_Click(object sender, EventArgs e)
{
resetSelezione();
checkVisibility();
}
protected void lbtSearchReset_Click(object sender, EventArgs e)
{
txtSearchArt.Text = "";
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
cmp_TechSheetArtAddNew.Visible = false;
}
checkVisibility();
cmp_TechSheetArtAddNew.eh_nuovoValore += Cmp_TechSheetArtAddNew_eh_nuovoValore;
}
protected void txtSearchArt_TextChanged(object sender, EventArgs e)
{
}
#endregion Protected Methods
#region Public Methods
public bool DelEnabled(object _numRow)
{
int numRows = 1;
int.TryParse(_numRow.ToString(), out numRows);
return numRows == 0;
}
public void doUpdate()
{
grView.DataBind();
}
public void resetSelezione()
{
grView.SelectedIndex = -1;
grView.DataBind();
raiseReset();
}
#endregion Public Methods
}
}
+98
View File
@@ -0,0 +1,98 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_TechSheetArt
{
/// <summary>
/// Controllo txtSearchArt.
/// </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.TextBox txtSearchArt;
/// <summary>
/// Controllo lbtSearchReset.
/// </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 lbtSearchReset;
/// <summary>
/// Controllo ddlTipo.
/// </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.DropDownList ddlTipo;
/// <summary>
/// Controllo odsTipo.
/// </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.ObjectDataSource odsTipo;
/// <summary>
/// Controllo lbtAddNew.
/// </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 lbtAddNew;
/// <summary>
/// Controllo lbtApprove.
/// </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 lbtApprove;
/// <summary>
/// Controllo cmp_TechSheetArtAddNew.
/// </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_TechSheetArtAddNew cmp_TechSheetArtAddNew;
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
}
}
@@ -0,0 +1,24 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_TechSheetArtAddNew.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_TechSheetArtAddNew" %>
<div class="row my-1">
<div class="col-9">
<div class="input-group">
<div class="input-group-prepend">
<asp:TextBox runat="server" ID="txtSearch" CssClass="form form-control" AutoPostBack="True" OnTextChanged="txtSearch_TextChanged" placeholder="Ricerca" Width="5em" />
</div>
<asp:DropDownList runat="server" ID="ddlArticolo" DataSourceID="odsArticoli" DataTextField="label" DataValueField="value" CssClass="form-control" OnSelectedIndexChanged="ddlArticolo_SelectedIndexChanged" AutoPostBack="true"></asp:DropDownList>
<asp:ObjectDataSource ID="odsArticoli" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditio" TypeName="MapoDb.DS_UtilityTableAdapters.v_selArticoliTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="txtSearch" DefaultValue="Non definito" Name="conditio" PropertyName="Text" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfCodTipo" />
</div>
</div>
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtAddNew" CssClass="btn btn-block btn-success" OnClick="lbtAddNew_Click">SAVE <i class="fa fa-floppy-o" aria-hidden="true"></i></asp:LinkButton>
</div>
<div class="col-12">
<asp:Label runat="server" ID="lblMessage" CssClass="text-danger" />
</div>
</div>
@@ -0,0 +1,112 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_TechSheetArtAddNew : BaseUserControl
{
#region Public Properties
public string CodArticolo
{
get
{
return ddlArticolo.SelectedValue;
}
}
public string CodTempl
{
get
{
return hfCodTipo.Value;
}
set
{
hfCodTipo.Value = value;
preliminaryCheck();
}
}
#endregion Public Properties
#region Private Methods
/// <summary>
/// verifiche preliminari inserimento scheda
/// </summary>
/// <returns></returns>
private bool preliminaryCheck()
{
bool answ = false;
// verifico OK selezione tipo
if (string.IsNullOrEmpty(CodTempl))
{
displError("Errore! prego selezionare tipo scheda per proseguire.");
}
else
{
// verifico NON esista già
var tabST = DataLayerObj.taSTA.getBySearchArt(CodArticolo, CodTempl);
if (tabST.Rows.Count > 0)
{
displError("Errore! Scheda articolo già presente.");
}
else
{
// ok valido!
answ = true;
}
}
lbtAddNew.Enabled = answ;
return answ;
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// selezione articolo
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlArticolo_SelectedIndexChanged(object sender, EventArgs e)
{
preliminaryCheck();
}
protected void displError(string message)
{
lblMessage.Text = message;
lblMessage.Visible = !string.IsNullOrEmpty(message);
}
protected void lbtAddNew_Click(object sender, EventArgs e)
{
bool checkOk = preliminaryCheck();
if (checkOk)
{
DataLayerObj.taSTA.InsertQuery(CodTempl, CodArticolo, user_std.UtSn.userNameAD);
raiseNewVal();
}
}
protected void Page_Load(object sender, EventArgs e)
{
lblMessage.Visible = false;
}
protected void txtSearch_TextChanged(object sender, EventArgs e)
{
ddlArticolo.DataBind();
}
#endregion Protected Methods
}
}
@@ -0,0 +1,71 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_TechSheetArtAddNew
{
/// <summary>
/// Controllo txtSearch.
/// </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.TextBox txtSearch;
/// <summary>
/// Controllo ddlArticolo.
/// </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.DropDownList ddlArticolo;
/// <summary>
/// Controllo odsArticoli.
/// </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.ObjectDataSource odsArticoli;
/// <summary>
/// Controllo hfCodTipo.
/// </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.HiddenField hfCodTipo;
/// <summary>
/// Controllo lbtAddNew.
/// </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 lbtAddNew;
/// <summary>
/// Controllo lblMessage.
/// </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.Label lblMessage;
}
}
@@ -0,0 +1,100 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_TechSheetDetail.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_TechSheetDetail" %>
<%@ Register Src="~/WebUserControls/cmp_ImageArchive.ascx" TagPrefix="uc1" TagName="cmp_ImageArchive" %>
<div runat="server" id="divDetail" class="row border border-info">
<div class="col-12">
<div class="row table-info py-1">
<asp:Repeater runat="server" ID="repAddTemplate" DataSourceID="odsGruppi">
<ItemTemplate>
<div class="col">
<asp:LinkButton ID="lbtAddTemplate" runat="server" CssClass='<%# "btn btn-sm btn-block " + Eval("CssClass") %>' CommandArgument='<%# Eval("CodGruppo") %>' OnClick="lbtAddTemplate_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmAddTemplateRows") %>'><i class="fa fa-plus" aria-hidden="true"></i> <%# Eval("DescGruppo")%></asp:LinkButton>
</div>
</ItemTemplate>
</asp:Repeater>
<asp:ObjectDataSource runat="server" ID="odsGruppi" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_AnagGruppiTableAdapter"></asp:ObjectDataSource>
<%--<div class="col">
<asp:HyperLink runat="server" ID="hlImageArchive" Target="_blank" NavigateUrl="~/ImageArchive" CssClass="btn btn-sm btn-block btn-primary text-light">
<i class="fa fa-file-image-o" aria-hidden="true"></i> <%: traduci("ImageArchive") %> <i class="fa fa-arrow-right" aria-hidden="true"></i>
</asp:HyperLink>
</div>--%>
</div>
</div>
<div class="col-12 mb-1 py-1 table-info border border-info border-top-0 border-left-0 border-right-0">
<uc1:cmp_ImageArchive runat="server" ID="cmp_ImageArchive" />
<asp:HiddenField runat="server" ID="hfSelImage" />
</div>
<div class="col-12">
<asp:GridView runat="server" ID="grView" DataSourceID="ods" CssClass="table table-sm table-striped" AllowSorting="True" AutoGenerateColumns="False" DataKeyNames="IdxST,Label,Oggetto" OnRowUpdated="grView_RowUpdated" OnRowCancelingEdit="grView_RowCancelingEdit" OnRowEditing="grView_RowEditing" OnRowDeleted="grView_RowDeleted">
<EditRowStyle CssClass="table-info" />
<SelectedRowStyle CssClass="table-info" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
<EmptyDataTemplate>
Nessun record trovato
</EmptyDataTemplate>
<Columns>
<%--<asp:BoundField DataField="IdxST" HeaderText="IdxST" ReadOnly="True" SortExpression="IdxST" />--%>
<%--<asp:BoundField DataField="CodGruppo" HeaderText="CodGruppo" SortExpression="CodGruppo" />--%>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbtEdit" runat="server" CausesValidation="False" CommandName="Edit" CssClass="btn btn-sm btn-primary"><i class="fa fa-edit" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
<EditItemTemplate>
<asp:LinkButton ID="lbtUpdate" runat="server" CausesValidation="True" CommandName="Update" CssClass="btn btn-sm btn-success"><i class="fa fa-check" aria-hidden="true"></i></asp:LinkButton>
</EditItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="DescGruppo" HeaderText="Gruppo" SortExpression="DescGruppo" ReadOnly="True" />
<asp:BoundField DataField="Oggetto" HeaderText="Oggetto" ReadOnly="True" SortExpression="Oggetto" />
<%--<asp:BoundField DataField="Label" HeaderText="Label" ReadOnly="True" SortExpression="Label" />--%>
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" ReadOnly="True" />
<%--<asp:BoundField DataField="CodTipo" HeaderText="CodTipo" SortExpression="CodTipo" />--%>
<asp:BoundField DataField="DescTipo" HeaderText="Tipo" SortExpression="DescTipo" ReadOnly="True" />
<asp:BoundField DataField="Num" HeaderText="Num" SortExpression="Num" ReadOnly="True" />
<asp:TemplateField HeaderText="Valore" SortExpression="Value">
<EditItemTemplate>
<div class="input-group mb-3">
<asp:TextBox ID="txtValue" runat="server" Text='<%# Bind("Value") %>' CssClass="form-control" />
<div runat="server" id="divSelImg" class="input-group-append" visible='<%# showImage(Eval("CodTipo")) %>'>
<asp:LinkButton runat="server" ID="lbtSelImage" CssClass="input-group-text btn btn-block" OnClick="lbtSelImage_Click" CommandArgument='<%# Eval("Value") %>'><i class="fa fa-arrow-left" aria-hidden="true"></i> <i class="fa fa-file-image-o" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblValue" runat="server" Text='<%# Eval("Value") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="CheckType" HeaderText="Check" SortExpression="CheckType" ReadOnly="True" />
<asp:CheckBoxField DataField="Required" HeaderText="Req" SortExpression="Required" ReadOnly="True" />
<%--<asp:BoundField DataField="ExtCode" HeaderText="ExtCode" SortExpression="ExtCode" />--%>
<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<asp:LinkButton ID="lbtDelete" runat="server" CausesValidation="False" CommandName="Delete" CssClass="btn btn-sm btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmDelete") %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
</ItemTemplate>
<EditItemTemplate>
<asp:LinkButton ID="lbtCancel" runat="server" CausesValidation="False" CommandName="Cancel" CssClass="btn btn-sm btn-warning"><i class="fa fa-ban" aria-hidden="true"></i></asp:LinkButton>
</EditItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource runat="server" ID="ods" OldValuesParameterFormatString="original_{0}" SelectMethod="getByST" TypeName="MapoDb.DS_SheetTechTableAdapters.ST_ActualRowTableAdapter" DeleteMethod="DeleteQuery" UpdateMethod="UpdateVal">
<SelectParameters>
<asp:ControlParameter ControlID="hfIdxST" Name="IdxST" PropertyName="Value" Type="Int32" />
</SelectParameters>
<DeleteParameters>
<asp:Parameter Name="Original_IdxST" Type="Int32" />
<asp:Parameter Name="Original_Label" Type="String" />
<asp:Parameter Name="Original_Oggetto" Type="Int32" />
</DeleteParameters>
<UpdateParameters>
<asp:Parameter Name="Original_IdxST" Type="Int32" />
<asp:Parameter Name="Original_Label" Type="String" />
<asp:Parameter Name="Original_Oggetto" Type="Int32" />
<asp:Parameter Name="Value" Type="String" />
</UpdateParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfIdxST" />
</div>
</div>
@@ -0,0 +1,163 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_TechSheetDetail : BaseUserControl
{
#region Protected Properties
protected string selImage
{
get
{
return hfSelImage.Value;
}
set
{
hfSelImage.Value = value;
// seleziono solo NOME SENZA SEDISENZA:..
string nameOnly = value;
if (nameOnly.Contains("."))
{
nameOnly = nameOnly.Substring(0, nameOnly.IndexOf("."));
}
cmp_ImageArchive.SearchVal = nameOnly;
}
}
#endregion Protected Properties
#region Public Properties
public int IdxST
{
get
{
int answ = 0;
int.TryParse(hfIdxST.Value, out answ);
return answ;
}
set
{
hfIdxST.Value = $"{value}";
doUpdate();
}
}
#endregion Public Properties
#region Private Methods
private void checkVisibility()
{
divDetail.Visible = IdxST > 0;
cmp_ImageArchive.Visible = !string.IsNullOrEmpty(selImage);
}
private void Cmp_ImageArchive_eh_selValore(object sender, EventArgs e)
{
// se in edit --> scrivo valore selezionato...
if (!string.IsNullOrEmpty(cmp_ImageArchive.selImage))
{
if (grView.EditIndex >= 0)
{
var grRow = grView.Rows[grView.EditIndex];
if (grRow != null)
{
TextBox txtValore = (TextBox)grRow.FindControl("txtValue");
txtValore.Text = cmp_ImageArchive.selImage;
}
}
}
}
#endregion Private Methods
#region Protected Methods
protected void grView_RowCancelingEdit(object sender, GridViewCancelEditEventArgs e)
{
selImage = "";
checkVisibility();
}
protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e)
{
selImage = "";
checkVisibility();
raiseNewVal();
}
protected void grView_RowEditing(object sender, GridViewEditEventArgs e)
{
selImage = "";
checkVisibility();
}
protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e)
{
selImage = "";
checkVisibility();
raiseNewVal();
}
protected void lbtAddTemplate_Click(object sender, EventArgs e)
{
// recupero argomento...
LinkButton lbt = (LinkButton)sender;
if (!string.IsNullOrEmpty(lbt.CommandArgument))
{
// chiamo stored x aggiungere da template...
DataLayerObj.taSTAR.addByTemplate(IdxST, lbt.CommandArgument);
}
doUpdate();
raiseNewVal();
}
protected void lbtSelImage_Click(object sender, EventArgs e)
{
LinkButton lbt = (LinkButton)sender;
if (lbt != null)
{
string filtImage = string.IsNullOrEmpty(lbt.CommandArgument) ? "*" : lbt.CommandArgument;
selImage = filtImage;
}
checkVisibility();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
cmp_ImageArchive.Visible = false;
}
checkVisibility();
cmp_ImageArchive.eh_selValore += Cmp_ImageArchive_eh_selValore;
}
#endregion Protected Methods
#region Public Methods
public void doUpdate()
{
grView.SelectedIndex = -1;
grView.DataBind();
checkVisibility();
}
public bool showImage(object CodTipo)
{
bool answ = false;
answ = CodTipo.ToString().Equals("IMG");
return answ;
}
#endregion Public Methods
}
}
@@ -0,0 +1,89 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_TechSheetDetail
{
/// <summary>
/// Controllo divDetail.
/// </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 divDetail;
/// <summary>
/// Controllo repAddTemplate.
/// </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.Repeater repAddTemplate;
/// <summary>
/// Controllo odsGruppi.
/// </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.ObjectDataSource odsGruppi;
/// <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;
/// <summary>
/// Controllo hfSelImage.
/// </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.HiddenField hfSelImage;
/// <summary>
/// Controllo grView.
/// </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.GridView grView;
/// <summary>
/// Controllo ods.
/// </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.ObjectDataSource ods;
/// <summary>
/// Controllo hfIdxST.
/// </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.HiddenField hfIdxST;
}
}
@@ -0,0 +1,16 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_TechSheetMan.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_TechSheetMan" %>
<%@ Register Src="~/WebUserControls/cmp_TechSheetArt.ascx" TagPrefix="uc1" TagName="cmp_TechSheetArt" %>
<%@ Register Src="~/WebUserControls/cmp_TechSheetDetail.ascx" TagPrefix="uc1" TagName="cmp_TechSheetDetail" %>
<%@ Register Src="~/WebUserControls/cmp_ST_preview.ascx" TagPrefix="uc1" TagName="cmp_ST_preview" %>
<div class="row">
<div class="col-4">
<uc1:cmp_TechSheetArt runat="server" ID="cmp_TechSheetArt" />
</div>
<div class="col-8">
<uc1:cmp_ST_preview runat="server" ID="cmp_ST_preview" />
<uc1:cmp_TechSheetDetail runat="server" ID="cmp_TechSheetDetail" />
<asp:HiddenField runat="server" ID="hfIdxST" Value="0" />
<asp:HiddenField runat="server" ID="hfEditMode" />
</div>
</div>
@@ -0,0 +1,136 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_TechSheetMan : System.Web.UI.UserControl
{
#region Protected Fields
protected int dummyArt = 0;
#endregion Protected Fields
#region Protected Properties
protected bool editMode
{
get
{
bool answ = false;
bool.TryParse(hfEditMode.Value, out answ);
return answ;
}
set
{
hfEditMode.Value = $"{value}";
fixShowDetail(value);
}
}
protected int IdxST
{
get
{
int answ = 0;
int.TryParse(hfIdxST.Value, out answ);
return answ;
}
set
{
hfIdxST.Value = $"{value}";
cmp_TechSheetDetail.IdxST = value;
cmp_ST_preview.IdxST = value;
fixShowDetail(false);
}
}
#endregion Protected Properties
#region Private Methods
/// <summary>
/// Selezione preview --> edit
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void Cmp_ST_preview_eh_nuovoValore(object sender, EventArgs e)
{
editMode = true;
}
private void Cmp_ST_preview_eh_resetSelezione(object sender, EventArgs e)
{
// resetto...
IdxST = dummyArt;
cmp_TechSheetArt.doUpdate();
}
private void Cmp_TechSheetArt_eh_nuovoValore(object sender, EventArgs e)
{
IdxST = dummyArt;
}
private void Cmp_TechSheetArt_eh_resetSelezione(object sender, EventArgs e)
{
IdxST = dummyArt;
}
private void Cmp_TechSheetArt_eh_selValore(object sender, EventArgs e)
{
//cmp_TechSheetDetail.Visible = true;
IdxST = cmp_TechSheetArt.IdxStSel;
}
private void Cmp_TechSheetDetail_eh_nuovoValore(object sender, EventArgs e)
{
// aggiorno articolo
cmp_TechSheetArt.doUpdate();
}
/// <summary>
/// Sistemazione visualizzazione dettagli
/// </summary>
/// <param name="editMode"></param>
private void fixShowDetail(bool editMode)
{
// sistemo visualizzazione dettagli
if (IdxST > 0)
{
cmp_TechSheetDetail.Visible = editMode;
cmp_ST_preview.Visible = !editMode;
}
else
{
cmp_TechSheetDetail.Visible = false;
cmp_ST_preview.Visible = false;
}
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
cmp_TechSheetArt.resetSelezione();
IdxST = dummyArt;
editMode = false;
}
cmp_TechSheetArt.eh_nuovoValore += Cmp_TechSheetArt_eh_nuovoValore;
cmp_TechSheetArt.eh_selValore += Cmp_TechSheetArt_eh_selValore;
cmp_TechSheetArt.eh_resetSelezione += Cmp_TechSheetArt_eh_resetSelezione;
cmp_TechSheetDetail.eh_nuovoValore += Cmp_TechSheetDetail_eh_nuovoValore;
cmp_ST_preview.eh_nuovoValore += Cmp_ST_preview_eh_nuovoValore;
cmp_ST_preview.eh_resetSelezione += Cmp_ST_preview_eh_resetSelezione;
}
#endregion Protected Methods
}
}
+62
View File
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_TechSheetMan
{
/// <summary>
/// Controllo cmp_TechSheetArt.
/// </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_TechSheetArt cmp_TechSheetArt;
/// <summary>
/// Controllo cmp_ST_preview.
/// </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_ST_preview cmp_ST_preview;
/// <summary>
/// Controllo cmp_TechSheetDetail.
/// </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_TechSheetDetail cmp_TechSheetDetail;
/// <summary>
/// Controllo hfIdxST.
/// </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.HiddenField hfIdxST;
/// <summary>
/// Controllo hfEditMode.
/// </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.HiddenField hfEditMode;
}
}
@@ -0,0 +1,25 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_fileUpload.ascx.cs" Inherits="MP_ADM.WebUserControls.cmp_fileUpload" %>
<asp:HiddenField runat="server" ID="hfWriteEnabled" />
<asp:HiddenField runat="server" ID="hfForceRedirect" />
<asp:HiddenField runat="server" ID="hfFilePrefix" />
<asp:HiddenField runat="server" ID="hfFileSuffix" />
<div id="divFileUpl" runat="server" class="row">
<div class="col-12 col-sm-3 col-md-2">
<asp:LinkButton ID="lbtCancel" runat="server" Text="Annulla" OnClick="btnCancel_Click" CssClass="btn btn-warning form-control"><%: traduci("cancel") %></asp:LinkButton>
</div>
<div class="col-12 col-sm-6 col-md-8">
<asp:FileUpload ID="FileUpload1" runat="server" CssClass="form-control py-1" />
</div>
<div class="col-12 col-sm-3 col-md-2">
<asp:LinkButton ID="lbtUpload" runat="server" Text="Upload" OnClick="Upload" CssClass="btn btn-success form-control"><%: traduci("doUpload") %></asp:LinkButton>
</div>
</div>
<div id="divNewEdit" runat="server" class="row">
<div class="col-12 col-sm-3 col-md-2">
<asp:LinkButton ID="btnAdd" runat="server" OnClick="btnAdd_Click" CssClass="btn btn-info form-control"><%: traduci("UploadFile") %></asp:LinkButton>
</div>
</div>
<div id="divMessagge" runat="server" class="bg-danger border border-danger text-center my-2">
<asp:Label runat="server" ID="lblMessage" CssClass="text-warning" />
</div>
@@ -0,0 +1,307 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace MP_ADM.WebUserControls
{
public partial class cmp_fileUpload : BaseUserControl
{
#region Protected Fields
/// <summary>
/// Folder salvataggio file
/// </summary>
protected string _SqlCopyDir = memLayer.ML.CRS("_SqlCopyDir");
/// <summary>
/// Folder di upload temporaneo files
/// </summary>
protected string _tempUploadDir = memLayer.ML.CRS("_tempUploadDir");
#endregion Protected Fields
#region Public Events
/// <summary>
/// Evento upload e salvataggio su server IIS del file...
/// </summary>
public event EventHandler<FileUploadEventArgs> eh_FileUploaded;
#endregion Public Events
#region Public Properties
/// <summary>
/// Prefisso file abilitato
/// </summary>
public string filePrefix
{
get
{
return hfFilePrefix.Value;
}
set
{
hfFilePrefix.Value = value;
}
}
/// <summary>
/// Suffisso file abilitato (=tipo)
/// </summary>
public string fileSuffix
{
get
{
return hfFileSuffix.Value;
}
set
{
hfFileSuffix.Value = value;
}
}
/// <summary>
/// Indica se fare redirect post upload
/// </summary>
public bool forceRedirect
{
get
{
bool answ = true;
bool.TryParse(hfForceRedirect.Value, out answ);
return answ;
}
set
{
hfForceRedirect.Value = value.ToString();
}
}
public bool isWriteEnabled
{
get
{
bool answ = false;
bool.TryParse(hfWriteEnabled.Value, out answ);
return answ;
}
set
{
hfWriteEnabled.Value = value.ToString();
}
}
/// <summary>
/// permesso scrittura SE E' abilitato a partire dalla tab diritti...
/// </summary>
public bool userIsAuth
{
get
{
return true;
//return (idxAmm + idxFornitore > 0);
}
}
#endregion Public Properties
#region Private Methods
/// <summary>
/// Procedee a bonificare la cartella di upload dei files + vecchi di 3 mesi
/// </summary>
private void deleteOldFiles()
{
string dirPath = Server.MapPath(_tempUploadDir);
// elenco files nella directory
string[] files = Directory.GetFiles(dirPath);
// li guardo tutti e se vecchi li elimino...
foreach (string file in files)
{
FileInfo fi = new FileInfo(file);
if (fi.LastAccessTime < DateTime.Now.AddMonths(-1))
fi.Delete();
}
}
/// <summary>
/// fix visibilità controllo file upload
/// </summary>
/// <param name="showAdd">mostra controlli add=true oppure nasconde = false</param>
private void fisVisFU(bool showAdd)
{
divFileUpl.Visible = showAdd;
btnAdd.Visible = !showAdd;
lbtCancel.Visible = showAdd;
}
#endregion Private Methods
#region Protected Methods
protected void btnAdd_Click(object sender, EventArgs e)
{
fisVisFU(true);
lbtUpload.Text = traduci("AddNew");
}
protected void btnCancel_Click(object sender, EventArgs e)
{
Response.Redirect(Request.RawUrl);
}
protected void Page_Load(object sender, EventArgs e)
{
if (!IsPostBack)
{
divMessagge.Visible = false;
fisVisFU(false);
deleteOldFiles();
}
divNewEdit.Visible = userIsAuth && isWriteEnabled;
}
protected void Upload(object sender, EventArgs e)
{
string uplFileName = "";
string uploadedFilename = "";
string batchName = "";
string savedFilename = "";
string contentType = "";
DateTime adesso = DateTime.Now;
string dirFrom = Server.MapPath(_tempUploadDir);
// se c'è un file
if (FileUpload1.PostedFile != null)
{
uploadedFilename = Path.GetFileName(FileUpload1.PostedFile.FileName.Replace(" ", "_")).ToLower();
// verifico suffisso sia corretto...
if (!string.IsNullOrEmpty(fileSuffix) && !uploadedFilename.EndsWith(fileSuffix.ToLower()))
{
divMessagge.Visible = true;
lblMessage.Text = $"{traduci("FileSuffixError")} {fileSuffix}";
}
else
{
// se sono a validare dxf...
if (fileSuffix == ".dxf")
{
uplFileName = uploadedFilename;
batchName = uploadedFilename;
}
else
{
// altrimenti per csv CNC/KIT..
uplFileName = $"{adesso.ToString("dd-HHmmss")}_{uploadedFilename}";
batchName = uploadedFilename.Replace(fileSuffix, "").Replace("cnc", "").Replace("kit", "");
}
savedFilename = Server.MapPath($"{_tempUploadDir}{uplFileName}");
divMessagge.Visible = false;
// verifica preliminare del PRE del name...
if (!string.IsNullOrEmpty(filePrefix) && !uploadedFilename.StartsWith(filePrefix.ToLower()))
{
divMessagge.Visible = true;
lblMessage.Text = $"{traduci("FilePrefixError")} {filePrefix}";
}
else
{
contentType = FileUpload1.PostedFile.ContentType;
// accedo allo stream del file allegato
using (Stream fs = FileUpload1.PostedFile.InputStream)
{
// scrivo su file
FileStream file = new FileStream(savedFilename, FileMode.Create, FileAccess.Write);
fs.CopyTo(file);
file.Close();
// log!
logger.lg.scriviLog($"Effettuato salvataggio file {uploadedFilename} come {savedFilename}");
}
// segnaloc he ho CARICATO IN LOCALE il file
reportFileUploaded(new FileUploadEventArgs(dirFrom, uplFileName, batchName));
}
}
}
if (forceRedirect)
{
Response.Redirect(Request.RawUrl);
}
}
#endregion Protected Methods
#region Public Methods
/// <summary>
/// Solelva evento salvataggio file con messaggio path/nome
/// </summary>
/// <param name="localPath"></param>
/// <param name="fileName"></param>
public void reportFileUploaded(FileUploadEventArgs e)
{
EventHandler<FileUploadEventArgs> handler = eh_FileUploaded;
if (handler != null)
{
handler(this, e);
}
}
#endregion Public Methods
}
public class FileUploadEventArgs : EventArgs
{
#region Private Fields
private string _batchName;
private string _fileName;
private string _localPath;
#endregion Private Fields
#region Public Constructors
/// <summary>
/// Evento con argomenti soppevato post fileUpload
/// </summary>
/// <param name="localPath"></param>
/// <param name="fileName"></param>
/// <param name="batchName"></param>
public FileUploadEventArgs(string localPath, string fileName, string batchName)
{
_localPath = localPath;
_fileName = fileName;
_batchName = batchName;
}
#endregion Public Constructors
#region Public Properties
public string BatchName
{
get { return _batchName; }
set { _batchName = value; }
}
public string FileName
{
get { return _fileName; }
set { _fileName = value; }
}
public string LocalPath
{
get { return _localPath; }
set { _localPath = value; }
}
#endregion Public Properties
}
}
+125
View File
@@ -0,0 +1,125 @@
//------------------------------------------------------------------------------
// <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.WebUserControls
{
public partial class cmp_fileUpload
{
/// <summary>
/// Controllo hfWriteEnabled.
/// </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.HiddenField hfWriteEnabled;
/// <summary>
/// Controllo hfForceRedirect.
/// </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.HiddenField hfForceRedirect;
/// <summary>
/// Controllo hfFilePrefix.
/// </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.HiddenField hfFilePrefix;
/// <summary>
/// Controllo hfFileSuffix.
/// </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.HiddenField hfFileSuffix;
/// <summary>
/// Controllo divFileUpl.
/// </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 divFileUpl;
/// <summary>
/// Controllo lbtCancel.
/// </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 lbtCancel;
/// <summary>
/// Controllo FileUpload1.
/// </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.FileUpload FileUpload1;
/// <summary>
/// Controllo lbtUpload.
/// </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 lbtUpload;
/// <summary>
/// Controllo divNewEdit.
/// </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 divNewEdit;
/// <summary>
/// Controllo btnAdd.
/// </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 btnAdd;
/// <summary>
/// Controllo divMessagge.
/// </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 divMessagge;
/// <summary>
/// Controllo lblMessage.
/// </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.Label lblMessage;
}
}

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