367 Commits

Author SHA1 Message Date
Samuele Locatelli 3066866c1e Merge tag 'FixWarningMysql_03' into develop
Update con reinserimento controlli health check (tranne redis full)
2025-09-23 10:34:27 +02:00
Samuele Locatelli 71ab37f101 Merge branch 'release/FixWarningMysql_03' 2025-09-23 10:34:10 +02:00
Samuele Locatelli 6aed95aa68 Ri abilitato controllo Health 2025-09-23 10:33:51 +02:00
Samuele Locatelli 8a8f9fd7e6 Merge tag 'FixWarningMysql_02' into develop
Sistemazione CI/CD x rename versioni SDK
2025-09-23 09:34:16 +02:00
Samuele Locatelli 21bbcccf76 Merge branch 'release/FixWarningMysql_02' 2025-09-23 09:33:52 +02:00
Samuele Locatelli 3c2370748e update yaml x evitare modifiche non necessarie 2025-09-23 09:32:55 +02:00
Samuele Locatelli 52819429cb commentata sezione che da problemi CI/CD 2025-09-23 09:26:02 +02:00
Samuele Locatelli 9385a4a974 Merge tag 'FixWarningMysql_01' into develop
Update conf x errori warning disconnessione frequenti (50sec)
2025-09-23 09:15:58 +02:00
Samuele Locatelli 9c9e3df572 Merge branch 'release/FixWarningMysql_01' 2025-09-23 09:15:32 +02:00
Samuele Locatelli 1c114905fc Update parametri connessione: NON scadono subito connessioni e non da warning così rapidi/ricorrenti 2025-09-23 09:15:02 +02:00
Samuele Locatelli 07464904a9 Merge branch 'SDK' into develop 2025-09-22 19:37:27 +02:00
Samuele Locatelli 7f78fe8f31 Inizio modifiche x evitare errori in MariaDB call 2025-09-22 19:37:14 +02:00
Samuele Locatelli 5a2dc3e797 Merge branch 'develop' into SDK 2024-08-08 11:09:03 +02:00
Samuele Locatelli 826b611e2e Fix ping se indirizzo contenesse "/" (subdomain) 2024-08-08 11:08:51 +02:00
Samuele Locatelli 63cdf6d60a Merge tag 'FixActiveDeleteMan02' into develop
Sistemazione naming attivo/eliminato x evitare confusioni future
2024-08-05 14:29:43 +02:00
Samuele Locatelli f5b2480b82 Merge branch 'release/FixActiveDeleteMan02' 2024-08-05 14:29:30 +02:00
Samuele Locatelli 101f36bcd4 Merge branch 'develop' into SDK 2024-08-05 14:29:04 +02:00
Samuele Locatelli cc3b7ccfe6 Migration x gestione rinomiina campo attivo/delete 2024-08-05 14:28:47 +02:00
Samuele Locatelli fae86288d0 Inversione logica attivo/deleted x gestione cancellazione logica barre 2024-08-05 14:28:35 +02:00
Samuele Locatelli f5f0a790ee Merge branch 'develop' into SDK 2024-08-05 13:55:47 +02:00
Samuele Locatelli 25d90f9967 Merge tag 'FixActiveDeleteMan01' into develop
Modifica comportamento active/delete
2024-08-05 13:55:23 +02:00
Samuele Locatelli 107625a8b7 Merge branch 'release/FixActiveDeleteMan01' 2024-08-05 13:55:06 +02:00
Samuele Locatelli 2a9e70fca4 Update gestione isActive aggiunta a ItemDTO x cancellazione logica + update SDK 2024-08-05 13:54:41 +02:00
Samuele Locatelli 6af19b8dd5 Merge tag 'FixSelMaccProj01' into develop
Fix condizione reload su cambio selettore macchina
2024-08-02 16:43:16 +02:00
Samuele Locatelli 5c9b16a7a0 Merge branch 'release/FixSelMaccProj01' 2024-08-02 16:43:07 +02:00
Samuele Locatelli 2ee76314af Fix cambio filtro proj 2024-08-02 16:42:45 +02:00
Samuele Locatelli aef2465d97 Merge tag 'GestRemn04' into develop
Aggiunto default isRemn a true
2024-08-02 11:21:35 +02:00
Samuele Locatelli 005c05818b Merge branch 'release/GestRemn04' 2024-08-02 11:21:27 +02:00
Samuele Locatelli 24cb3d11ec Default a true x remnant su ogni barra 2024-08-02 11:20:59 +02:00
Samuele Locatelli e1f960c0b0 Merge tag 'GestRemn03' into develop
Ignoro i remnant in update su cloud
2024-08-02 10:39:05 +02:00
Samuele Locatelli 55e1cbdbbf Merge branch 'release/GestRemn03' 2024-08-02 10:38:53 +02:00
Samuele Locatelli 78d9779306 Ignoro update remnant state da EBW 2024-08-02 10:38:36 +02:00
Samuele Locatelli 4e7e14cddc Merge tag 'GestRemn02' into develop
Update icone spezzoni/acquisto
2024-08-02 09:40:55 +02:00
Samuele Locatelli b7bc89a49b Merge branch 'release/GestRemn02' 2024-08-02 09:40:40 +02:00
Samuele Locatelli 00d27713b8 Update icone x gestione 2024-08-02 09:39:45 +02:00
Samuele Locatelli 8983b3c7a5 Merge tag 'GestRemn01' into develop
Fix gestione spezzoni iniziale, x ricerca, filtraggio, display
2024-08-02 09:11:16 +02:00
Samuele Locatelli 1ae633c263 Merge branch 'release/GestRemn01' 2024-08-02 09:10:49 +02:00
Samuele Locatelli b0804c78e7 Update gestioen spezzoni
- fix calcolo qta
- fix display
- fix stored ricerca
2024-08-02 09:10:25 +02:00
Samuele Locatelli 5b1a067fc3 COmpletata gestione spezzoni x editing e display dettaglio 2024-08-02 08:50:44 +02:00
Samuele Locatelli 305f65180a Bozza gestione spezzoni/acquisto (MANCA fix grafico) 2024-08-01 19:05:02 +02:00
Samuele Locatelli 3797cb8c83 Update note vers 24.08.01 2024-08-01 17:07:55 +02:00
Samuele Locatelli 85ceef1474 Merge tag 'FixChangeBeamWallMat01' into develop
Fix refresh a cambio sel materiale beam/wall
2024-08-01 17:06:55 +02:00
Samuele Locatelli c0cabb53dc Merge branch 'release/FixChangeBeamWallMat01' 2024-08-01 17:06:42 +02:00
Samuele Locatelli b290fc40bf Fix reload al cambio tipo materiale (beam/wall) 2024-08-01 17:06:16 +02:00
Samuele Locatelli 0b94b3bb56 Update REDME 2024-07-31 19:41:11 +02:00
Samuele Locatelli 47a37075e7 Aggiunta script x generare log commit x changelog, ora da modificare il README principale e il vero changelog 2024-07-31 19:17:37 +02:00
Samuele Locatelli 0cebf0a1a8 Merge tag 'FixRedisMasterFlush01' into develop
Fix gestione flush
2024-07-30 15:02:15 +02:00
Samuele Locatelli 46a0c55e29 Merge branch 'release/FixRedisMasterFlush01' 2024-07-30 15:02:08 +02:00
Samuele Locatelli e8b97708b3 Completato review gestione cache redis x MagMan 2024-07-30 15:01:41 +02:00
Samuele Locatelli 6bd3686f44 Continuo riscrittura metodi gestione redis cache su classi separate 2024-07-30 14:44:38 +02:00
Samuele Locatelli 83ed7d9d96 Merge tag 'TestSentinelGalera01' into develop
Reimpostato localhost x Galera cluster e sentinel redis
2024-07-29 09:41:05 +02:00
Samuele Locatelli 9054d42c32 Merge branch 'release/TestSentinelGalera01' 2024-07-29 09:40:00 +02:00
Samuele Locatelli 08e54ff364 Update conf x usare sentinel (localhost) e db locale (galera cluster) 2024-07-29 09:39:26 +02:00
Samuele Locatelli a775e90f6a Merge tag 'FixRedisConf01' into develop
Fix gestione redis esterna
2024-07-24 18:54:26 +02:00
Samuele Locatelli c145634ae2 Merge branch 'release/FixRedisConf01' 2024-07-24 18:48:43 +02:00
Samuele Locatelli 3016ac6122 Fix gestione utente admin x porting redis 2024-07-24 18:48:14 +02:00
Samuele Locatelli 23eba38c9c update rest call 2024-07-24 18:48:04 +02:00
Samuele Locatelli 3d45c158e1 Merge tag 'AddSyncArchived01' into develop
Aggiunti metodi sync controller x stato archived, testati con insomnia
2024-07-17 10:22:00 +02:00
Samuele Locatelli 4003530565 Merge branch 'release/AddSyncArchived01' 2024-07-17 10:21:36 +02:00
Samuele Locatelli 5f4e85df07 Update metodo controller x sync stato archiviato 2024-07-17 10:21:13 +02:00
Samuele Locatelli 1319496e52 OK metodo get proj modificati 2024-07-17 09:57:49 +02:00
Samuele Locatelli a0e23f60d5 Merge branch 'develop' into SDK 2024-07-17 08:13:43 +02:00
Samuele Locatelli 8c773a6d56 Merge branch 'SDK' into develop 2024-07-17 08:13:36 +02:00
Samuele Locatelli 513212515b Bozza controller proj 2024-07-17 08:13:25 +02:00
Samuele Locatelli b18403dc04 Fix refresh in ricezione eventi da remoto 2024-07-17 08:13:11 +02:00
Samuele Locatelli 52b57cd118 Aggiunta metodi x SDK 2024-07-17 08:12:54 +02:00
Samuele Locatelli c872cc7a83 Merge tag 'FixQtyDecimal01' into develop
Fix gestione campo decimal x calcolo DTO da trasferire
2024-07-11 11:32:31 +02:00
Samuele Locatelli 5fba356222 Merge branch 'release/FixQtyDecimal01' 2024-07-11 11:32:18 +02:00
Samuele Locatelli 54292d6c1b Merge branch 'develop' into SDK 2024-07-11 11:31:53 +02:00
Samuele Locatelli b9c1f92539 Fix gestione campo QTY come decimal 2024-07-11 11:31:38 +02:00
Samuele Locatelli 65ac2dad4e Merge tag 'FixLogOutLoop01' into develop
Fix gestione logout con ritorno errato alla pagina uscita
2024-07-09 19:17:29 +02:00
Samuele Locatelli 7cae4c7bd9 Merge branch 'release/FixLogOutLoop01' 2024-07-09 19:17:08 +02:00
Samuele Locatelli 76758b14fe Fix logout/login loop 2024-07-09 19:16:44 +02:00
Samuele Locatelli f2d5f2d421 Merge tag 'AddEditMat01' into develop
Aggiunta modalità ADD nuovo materiale da Cloud
2024-07-09 19:08:35 +02:00
Samuele Locatelli 3e617bf253 Merge branch 'release/AddEditMat01' 2024-07-09 19:08:05 +02:00
Samuele Locatelli 55b2fcebdc Fix editing materiali da online 2024-07-09 19:07:39 +02:00
Samuele Locatelli 5881c233bf Update x gestione editing (nuovi) materiali online 2024-07-09 17:52:07 +02:00
Samuele Locatelli d53cb7335e Merge tag 'FixToggleArchiv01' into develop
Fix toggle archiviati
2024-07-09 11:37:30 +02:00
Samuele Locatelli bd1b1b043b Merge branch 'release/FixToggleArchiv01' 2024-07-09 11:37:24 +02:00
Samuele Locatelli 2805cdb99a Fix toggle archiviati 2024-07-09 11:36:57 +02:00
Samuele Locatelli 04ff808eb4 altro test fix hostname error 2024-07-09 09:05:36 +02:00
Samuele Locatelli 929f5fc472 test modifica healthcheck ping 2024-07-09 08:58:22 +02:00
Samuele Locatelli 6d4d6d2c9f Update conf healthcheck 2024-07-09 08:47:53 +02:00
Samuele Locatelli b38b722140 Fix show alias attivi 2024-07-08 14:39:19 +02:00
Samuele Locatelli 865241f814 Fix conf redis cluster in test 2024-07-08 11:50:19 +02:00
Samuele Locatelli 64d1d7a071 Fix conf Staging x testare MDB Galera + redis cluster 2024-07-08 11:25:47 +02:00
Samuele Locatelli 4adce530f9 Merge tag 'FixHeathAndServVers01' into develop
Fix controllo health tab DbCount + fix check vers server POMELO
2024-07-08 11:24:22 +02:00
Samuele Locatelli b64fed6dd2 Merge branch 'release/FixHeathAndServVers01' 2024-07-08 11:24:03 +02:00
Samuele Locatelli df305a15d6 Update gestione vers server MySql in fase setup 2024-07-08 11:12:29 +02:00
Samuele Locatelli 3f699b6f5c Modifica DbSet TableCount x EFCore 6 e health check 2024-07-08 11:12:04 +02:00
Samuele Locatelli c23a8f69c5 Altra modifica init config DB 2024-07-05 17:29:30 +02:00
Samuele Locatelli 79e9f9ddad Aggiunta modifiche x filtro utente SuperUser 2024-07-05 17:29:20 +02:00
Samuele Locatelli fa73d39171 Ancora test detect mysql version 2024-07-05 16:45:06 +02:00
Samuele Locatelli 792b679475 Altra modifica autodetect vers mysql 2024-07-05 16:34:22 +02:00
Samuele Locatelli 34307417e7 modifica metodi ricerca DB in autoconnect 2024-07-05 16:20:02 +02:00
Samuele Locatelli 82cb2d7337 Aggiunta metodi calcolo serverVersion alternativo x errore visto in test ufficio 2024-07-05 15:53:06 +02:00
Samuele Locatelli ee2bdbb30e Aggiunta nuovo ruolo SuperUser + migrations 2024-07-05 15:52:49 +02:00
Samuele Locatelli 1d96bef8c6 Merge tag 'NewQtyCalc01' into develop
Aggiunta nuova modalità calcolo lunghezze/aree disponibili x
materiali + fix paginazione e update
2024-07-04 15:19:40 +02:00
Samuele Locatelli c9cd3889da Merge branch 'release/NewQtyCalc01' 2024-07-04 15:19:20 +02:00
Samuele Locatelli 627a9297f7 Update calcolo quantità
fix display cambio pagina
2024-07-04 15:17:46 +02:00
Samuele Locatelli faf8a83725 Merge tag 'FixDecimalDisplay01' into develop
Fix visualizzazione e calcolo decimali in upsert su DB x quote intere:wq
2024-07-03 14:16:50 +02:00
Samuele Locatelli 68d131bc84 Merge branch 'release/FixDecimalDisplay01' 2024-07-03 14:15:25 +02:00
Samuele Locatelli 815f81697e Gestione decimali: fix display e caricamento 2024-07-03 14:14:41 +02:00
Samuele Locatelli 63746e43fa Merge tag 'FixGenCloudId' into develop
Gestione cloud ID rivista: stacca sempre nuovo se non presente in
chiamata
2024-07-03 10:09:27 +02:00
Samuele Locatelli c0cb268afa Merge branch 'release/FixGenCloudId' 2024-07-03 10:09:15 +02:00
Samuele Locatelli 0dd5cc104c Refresh gestione creazione nuovi ProjCloudId 2024-07-03 10:08:47 +02:00
Samuele Locatelli 55f5ef6087 Merge tag 'FixReportUpdate01' into develop
Aggiunta gestione ordinamento default x progetti + report update da
update risorse
2024-07-02 18:43:50 +02:00
Samuele Locatelli 82e92a100b Merge branch 'release/FixReportUpdate01' 2024-07-02 18:43:34 +02:00
Samuele Locatelli ee7b93e547 Update gestione refresh progetto da update risorsa 2024-07-02 18:43:14 +02:00
Samuele Locatelli ffbdbfacc8 Merge tag 'FixSearch01' into develop
Fix gestione ordinamento e ricerca Alias e Progetti
2024-07-02 18:12:55 +02:00
Samuele Locatelli f9084900dc Merge branch 'release/FixSearch01' 2024-07-02 18:12:36 +02:00
Samuele Locatelli e980c2b26f Fix refresh ricerca 2024-07-02 18:12:09 +02:00
Samuele Locatelli 178369a27e Merge tag 'FixIcons01' into develop
Fix icona archiviato
2024-07-02 17:12:53 +02:00
Samuele Locatelli 73ed092fbf Merge branch 'release/FixIcons01' 2024-07-02 17:12:48 +02:00
Samuele Locatelli ed1db6975f Update icona archiavto 2024-07-02 17:12:26 +02:00
Samuele Locatelli 789fba6059 Merge tag 'FixPaging02' into develop
Update gestione ordinamento progetti (lastAction) + materiali
2024-07-02 17:00:32 +02:00
Samuele Locatelli 6cad64847c Merge branch 'release/FixPaging02' 2024-07-02 17:00:12 +02:00
Samuele Locatelli 71dda0d162 Update x ordinamento Proj + fix materiali 2024-07-02 16:59:40 +02:00
Samuele Locatelli 64ea545712 Merge tag 'FixPaging01' into develop
Fix paginazione x alias in async
2024-07-02 12:03:34 +02:00
Samuele Locatelli c411f9ce37 Merge branch 'release/FixPaging01' 2024-07-02 12:03:16 +02:00
Samuele Locatelli 7d7d610d54 Metodo async x cambio pagina in Alias 2024-07-02 12:02:53 +02:00
Samuele Locatelli 64c55d4c93 Merge tag 'AddRefreshRest2UI_04' into develop
Completata review x reset ricerca al cambio pagina
2024-07-02 08:08:25 +02:00
Samuele Locatelli 0753fcf0ca Merge branch 'release/AddRefreshRest2UI_04' 2024-07-02 08:08:13 +02:00
Samuele Locatelli 852befac18 Update x gestione reset ricerca al cambio pagina 2024-07-02 08:07:51 +02:00
Samuele Locatelli 2b5bf3803c Ancora update gestione numRec pagina 2024-07-01 19:10:51 +02:00
Samuele Locatelli 9979252361 Altri update su numRec pagina impostati 2024-07-01 19:08:38 +02:00
Samuele Locatelli b1487a3f3e Spostamento da onAfterRender a onInitialized lettura num righe 2024-07-01 19:02:39 +02:00
Samuele Locatelli 1b0ff7fd1d Update x salvataggio num righe selezionate utente 2024-07-01 19:00:55 +02:00
Samuele Locatelli 7df4d7e9de Fix show toggle tutti/solo attivi x alias 2024-07-01 18:14:12 +02:00
Samuele Locatelli d20bcd4a1a Merge tag 'AddRefreshRest2UI_03' into develop
Aggiunta gestione refresh REST-UI x alias e materiali
2024-07-01 16:20:59 +02:00
Samuele Locatelli 0d86cb099e Merge branch 'release/AddRefreshRest2UI_03' 2024-07-01 16:20:41 +02:00
Samuele Locatelli ffca896c5d Aggiunta gestione notifica udpate x
- alias
- materiali
2024-07-01 16:20:22 +02:00
Samuele Locatelli 748c5d32b0 Merge tag 'AddRefreshRest2UI_02' into develop
Update dettagli risorse in caso di aggiornamento inventario e/o stima
2024-07-01 15:56:30 +02:00
Samuele Locatelli b4a789cc74 Merge branch 'release/AddRefreshRest2UI_02' 2024-07-01 15:56:15 +02:00
Samuele Locatelli 004858cdae Update gestione refresh
- updateresurces setim x invio stima
- update res act x invio update giacenze (inve)
2024-07-01 15:56:00 +02:00
Samuele Locatelli 031f2dc426 Merge tag 'AddRefreshRest2UI_01' into develop
Aggiunto metodo x update da chiamata rest a interfaccia x update proj
automatico
2024-07-01 15:22:55 +02:00
Samuele Locatelli 6341e02079 Merge branch 'release/AddRefreshRest2UI_01' 2024-07-01 15:22:35 +02:00
Samuele Locatelli f39e5802dd Aggiunta refresh x update proj da REST a UI 2024-07-01 15:21:53 +02:00
Samuele Locatelli 1851a06041 Aggiunto forzatura update pagina dettaglio progetto 2024-06-29 13:18:31 +02:00
Samuele Locatelli b22a9d8f8d Merge tag 'AddProjProgSyncro03' into develop
Update x gestione visualizzazione progressbar
2024-06-29 12:12:27 +02:00
Samuele Locatelli 877f760de5 Merge branch 'release/AddProjProgSyncro03' 2024-06-29 12:12:11 +02:00
Samuele Locatelli e3883ba9c4 Fix display perc avanzamento 2024-06-29 12:04:58 +02:00
Samuele Locatelli eefc5bd65a Fix comportmaenti dispose vari 2024-06-29 11:55:15 +02:00
Samuele Locatelli d8f462f9ec Merge tag 'AddProjProgSyncro02' into develop
Update nuova gestione info progress del proj
2024-06-29 11:44:12 +02:00
Samuele Locatelli 99851c7fda Merge branch 'release/AddProjProgSyncro02' 2024-06-29 11:43:43 +02:00
Samuele Locatelli ae6b6a46db Merge branch 'develop' into SDK 2024-06-29 11:43:20 +02:00
Samuele Locatelli ad888921f8 Update metodi x prog refresh con val act/max 2024-06-29 11:41:42 +02:00
Samuele Locatelli bf284a6cc9 Rivisto modello dati proj + migrations relative 2024-06-29 11:41:14 +02:00
Samuele Locatelli 695ac9f747 Update struttura chiamata invio progresso proj 2024-06-29 11:20:35 +02:00
Samuele Locatelli 58c4ae1381 Merge tag 'AddProjProgSyncro01' into develop
Aggiunta metodi e logiche x syncro progetto
2024-06-29 10:13:58 +02:00
Samuele Locatelli bf958a0809 Merge branch 'release/AddProjProgSyncro01' 2024-06-29 10:13:43 +02:00
Samuele Locatelli 00fc2ec32e Merge branch 'develop' into SDK 2024-06-29 10:13:01 +02:00
Samuele Locatelli 348cf90833 Update metodi in controller MagMan x invio progresso proj 2024-06-29 10:12:45 +02:00
Samuele Locatelli 540f2a6fc6 Aggiunta metodi x syncro progresso progetto 2024-06-29 10:12:13 +02:00
Samuele Locatelli 2f6676d9ea Fix display progetto con percentuale 2024-06-29 09:50:31 +02:00
Samuele Locatelli 89e5de94b7 Fix context OnModelCreatingPartial (tolto private) 2024-06-29 09:50:22 +02:00
Samuele Locatelli b088d712ca Inizio modifica interfaccia x nuove info progetto 2024-06-29 09:32:24 +02:00
Samuele Locatelli 2684579b6c Aggiunta metodi x update percProg progetto 2024-06-29 09:32:08 +02:00
Samuele Locatelli c55fc7b214 Aggiunta campo progPerc progetto + migrations 2024-06-29 09:31:32 +02:00
Samuele Locatelli 4805a7916a Aggiunta DTO x update avanzamento progetto 2024-06-29 09:31:07 +02:00
Samuele Locatelli 07e10a3ca6 Merge tag 'RemoveMatCodeEditOnItemRaw02' into develop
Disabilitato editing delle dimensioni barre
2024-06-28 18:53:22 +02:00
Samuele Locatelli ec71b70421 Merge branch 'release/RemoveMatCodeEditOnItemRaw02' 2024-06-28 18:48:14 +02:00
Samuele Locatelli bfa94f4eee Disabilitato editing di tutto in Material (codice, dimensioni...) 2024-06-28 18:47:55 +02:00
Samuele Locatelli 448052028d Merge tag 'RemoveMatCodeEditOnItemRaw' into develop
Rimossa editabilità materiale in RawItem
2024-06-28 18:26:01 +02:00
Samuele Locatelli 1ad6abff63 Merge branch 'release/RemoveMatCodeEditOnItemRaw' 2024-06-28 18:25:29 +02:00
Samuele Locatelli 33dbca043f Disabilitato editing cod materiale in ItemRaw 2024-06-28 18:24:59 +02:00
Samuele Locatelli e73b0335e5 Merge branch 'develop' into SDK 2024-06-26 17:38:42 +02:00
Samuele Locatelli acc5c989a1 Merge tag 'UpdateDeployAndRestSharp02' into develop
Fix init timeout
2024-06-26 17:35:51 +02:00
Samuele Locatelli ba5541cbb9 Merge branch 'release/UpdateDeployAndRestSharp02' 2024-06-26 17:35:43 +02:00
Samuele Locatelli d11d91fcf1 Fix init timeout 2024-06-26 17:35:28 +02:00
Samuele Locatelli 3f85b48faa Merge tag 'UpdateDeployAndRestSharp01' into develop
Update componenti RestSharp + update procedura merge con parallelistmo a
8 x dati storici
2024-06-26 17:32:32 +02:00
Samuele Locatelli 85cd73b169 Merge branch 'release/UpdateDeployAndRestSharp01' 2024-06-26 17:32:17 +02:00
Samuele Locatelli 60d4102881 Update dipendenze restSharp 2024-06-26 17:31:45 +02:00
Samuele Locatelli 2f652d1f0a update processing dati con test parallelismo a 8 2024-06-08 12:57:07 +02:00
Samuele Locatelli 0fce9bbe04 Update con test vari x data syncro 2024-06-08 12:31:20 +02:00
Samuele Locatelli fd9fa52d36 Update x testing deploy dati Lovato 2024-05-31 16:56:02 +02:00
Samuele Locatelli 53972d0480 Merge tag 'FixRawItemDeleteAndReactiv01' into develop
Permesso riattivazione record articoli eliminati + gestione
cancellazione logica x record negativi (es barre non caricate a
magazzino tipo remnant)
2024-05-07 17:40:03 +02:00
Samuele Locatelli 3998ff02ea Merge branch 'release/FixRawItemDeleteAndReactiv01' 2024-05-07 17:39:36 +02:00
Samuele Locatelli 05a88733ff Gestione eliminazione/riattivazione record negativi articoli RawItem 2024-05-07 17:38:53 +02:00
Samuele Locatelli 6c0e54f761 Aggiunta migrazione x Eventi 2024-05-02 19:53:59 +02:00
Samuele Locatelli 9fa4e2da64 Fix posizione stored 2024-05-02 19:53:39 +02:00
Samuele Locatelli c575266766 Aggiunta migrazione stored 2024-05-02 19:52:28 +02:00
Samuele Locatelli d45892b279 Update conf:
- redis su cluster
- DB su cluster
- RIfatta migration x considerazione su cluster
2024-05-02 10:14:20 +02:00
Samuele Locatelli 03b34ff547 stored (wip) 2024-04-30 19:30:26 +02:00
Samuele Locatelli 3c5c823fcf Fix migrazioni struttura DB 2024-04-30 19:30:02 +02:00
Samuele Locatelli 741f9c7794 Merge tag 'MacLogPage02' into develop
Update condizione aggiornamento ALIAS + inizio gest statistiche prod
2024-04-30 15:44:17 +02:00
Samuele Locatelli 291de6a80a Merge branch 'release/MacLogPage02' 2024-04-30 15:43:57 +02:00
Samuele Locatelli bc9748ec8e Update display x proj e macStatus 2024-04-30 15:43:37 +02:00
Samuele Locatelli a09b5495d9 Aggiunta preliminare tab statistiche quotidiane + stored (bozza) 2024-04-30 15:43:17 +02:00
Samuele Locatelli f51abc2f68 Update condizione aggiornamento Alias (accetta cambio attivazione) 2024-04-30 15:42:52 +02:00
Samuele Locatelli 8a492e3c1b Merge tag 'MacLogPage01' into develop
Inizio aggiunte x MacLogPage
2024-04-30 10:52:31 +02:00
Samuele Locatelli b963c29ba3 Merge branch 'release/MacLogPage01' 2024-04-30 10:52:21 +02:00
Samuele Locatelli b35f90a878 Prima bozza log macchina 2024-04-30 10:51:43 +02:00
Samuele Locatelli ba5263b9f4 Merge tag 'FixUpsertLogMachine01' into develop
Fix procedure upsert x LogMachine
2024-04-30 09:13:15 +02:00
Samuele Locatelli c901e5f1e9 Merge branch 'release/FixUpsertLogMachine01' 2024-04-30 09:13:05 +02:00
Samuele Locatelli 53bdb75258 Fix console app test datalayer 2024-04-30 09:12:34 +02:00
Samuele Locatelli 6d61eb57ac Fix naming variabile SUpervId 2024-04-30 09:12:24 +02:00
Samuele Locatelli 725115010c Cambio modalità check machineID x upsert 2024-04-30 09:12:05 +02:00
Samuele Locatelli b38d0bfea8 MagMan.Data.Tenant:
- fix LogMachine con SupervId
- fix migrations
2024-04-30 09:11:45 +02:00
Samuele Locatelli dc699c6ba3 Fix x nuget e test sistemazione proj + upload 2024-04-30 08:29:10 +02:00
Samuele Locatelli e37a78392c Merge tag 'FixEgwProxyNuget03' into develop
Fix finale nuget
2024-04-29 13:59:09 +02:00
Samuele Locatelli be50a43890 Merge branch 'release/FixEgwProxyNuget03' 2024-04-29 13:58:42 +02:00
Samuele Locatelli d0e7afcd83 Merge branch 'develop' into SDK 2024-04-29 13:58:20 +02:00
Samuele Locatelli 89a84223ba Update UI x conversione DTO 2024-04-29 13:58:07 +02:00
Samuele Locatelli 80f4c706ae Merge branch 'develop' into SDK 2024-04-29 11:36:03 +02:00
Samuele Locatelli ecd693533e Merge tag 'FixEgwProxyNuget02' into develop
Fix DTO x nuget upload
2024-04-29 11:35:55 +02:00
Samuele Locatelli fc822a9d69 Merge branch 'release/FixEgwProxyNuget02' 2024-04-29 11:35:44 +02:00
Samuele Locatelli cd9640805b Update modello dati LogMachine + nuget da aggiornare 2024-04-29 11:35:07 +02:00
Samuele Locatelli c7790e3dfb Merge branch 'main' into SDK 2024-04-27 12:18:09 +02:00
Samuele Locatelli 05f7edfdc7 Merge tag 'FixEgwProxyNuget01' into develop
Fix gestione pacchetti nuget x proxy nuget
2024-04-27 12:17:58 +02:00
Samuele Locatelli d033910a9c Merge branch 'release/FixEgwProxyNuget01' 2024-04-27 12:17:49 +02:00
Samuele Locatelli 8c2e1c659a Fix procedure restore nexus list 2024-04-27 12:16:19 +02:00
Samuele Locatelli f8dbce0853 Fix nuget x DataLayer di test 2024-04-27 12:13:54 +02:00
Samuele Locatelli 73ca1cadbd Merge tag 'AddLogMachineSync' into develop
Aggiunto meccaniscmo SYNC + test da cnosole x record LogMachine
2024-04-27 11:59:27 +02:00
Samuele Locatelli 8e98a486a0 Merge branch 'release/AddLogMachineSync' 2024-04-27 11:59:11 +02:00
Samuele Locatelli 62c47e7b36 Merge branch 'develop' into SDK 2024-04-27 11:58:37 +02:00
Samuele Locatelli e38c80da47 COmpletata validazione SRV API UI + test da console 2024-04-27 11:58:27 +02:00
Samuele Locatelli 5eb34cef4e Update metodi x nuget (test letura DB + invio) 2024-04-27 11:42:12 +02:00
Samuele Locatelli df2e281744 Completo commit migrations 2024-04-27 11:41:59 +02:00
Samuele Locatelli 8a8018a8cc MagMan:
- aggiunta tab LogMachine + migrations
- aggiunto metodi sync
2024-04-27 11:41:44 +02:00
Samuele Locatelli 78aa06508e Bozza controller salvataggio log macchina 2024-04-26 18:05:22 +02:00
Samuele Locatelli 5951693058 Typo (minor) 2024-04-26 18:05:10 +02:00
Samuele Locatelli d0e7b5724e Update componente SDK x invio dati log eventi 2024-04-26 18:04:14 +02:00
Samuele Locatelli cc1f014587 Merge tag 'FixLoginPagesLayout02' into develop
Fix pagine management utente x layout
2024-04-26 12:33:08 +02:00
Samuele Locatelli 664f6fec06 Merge branch 'release/FixLoginPagesLayout02' 2024-04-26 12:32:58 +02:00
Samuele Locatelli 36678bd629 Fix grafica area manage account 2024-04-26 12:32:40 +02:00
Samuele Locatelli 49f8032bbe Merge tag 'FixLoginPagesLayout01' into develop
Fix pagine varie login x gestione grafica unitaria
2024-04-26 11:38:32 +02:00
Samuele Locatelli 5bed52e26e Merge branch 'release/FixLoginPagesLayout01' 2024-04-26 11:37:35 +02:00
Samuele Locatelli 996d4d87c3 Riscrittura template accesso/LOGIN 2024-04-26 11:36:59 +02:00
Samuele Locatelli 163cd16b6b Merge tag 'FixEditMateriali01' into develop
Fix gestione materiali in editing
2024-04-26 09:26:46 +02:00
Samuele Locatelli 948e777957 Merge branch 'release/FixEditMateriali01' 2024-04-26 09:26:36 +02:00
Samuele Locatelli 6739b18fd5 Fix edit materiali 2024-04-26 09:24:14 +02:00
Samuele Locatelli d9e26de7ac Merge tag 'UpdateNuget_240424_02' into develop
Completo rimozione pacchetti non encessari da nuget con fix
2024-04-24 19:04:56 +02:00
Samuele Locatelli 930d9d7292 Merge branch 'release/UpdateNuget_240424_02' 2024-04-24 19:04:45 +02:00
Samuele Locatelli 9f2e6c5151 rimozione componente + nuget packaging 2024-04-24 19:03:20 +02:00
Samuele Locatelli 3db5945b15 Rimozione SqlClient inutilizzato 2024-04-24 19:00:47 +02:00
Samuele Locatelli 4eacd656f8 Rimozione nuget non encessari 2024-04-24 18:59:38 +02:00
Samuele Locatelli 99a22f7f1e Merge tag 'UpdateNuget_240424' into develop
Update pacchetti nuget vari all'ultima release + fix pacchetti deprecati
di base
2024-04-24 18:56:39 +02:00
Samuele Locatelli bba2865f9f Merge branch 'release/UpdateNuget_240424' 2024-04-24 18:55:56 +02:00
Samuele Locatelli de748bd486 Update x rimozione blocco DatiMacchine da index page menu 2024-04-24 18:54:08 +02:00
Samuele Locatelli c480bb89d6 Update nuget pacchetti deprecati 2024-04-24 18:52:10 +02:00
Samuele Locatelli cca56c8f62 Gestione isDebug:
- menu DatiMacchine visibile solo in debug
- update akltre librerie nuget
2024-04-24 18:50:28 +02:00
Samuele Locatelli b29f96a233 Update nuget (EGW) 2024-04-24 18:35:09 +02:00
Samuele Locatelli f8aee63cee Merge tag 'FixChecks01' into develop
Fix vari x health checks
2024-04-24 09:18:00 +02:00
Samuele Locatelli 623d115d6c Merge branch 'release/FixChecks01' 2024-04-24 09:17:45 +02:00
Samuele Locatelli 8f2b190ad2 Update healtch check + UI 2024-04-24 09:17:23 +02:00
Samuele Locatelli bcb79ee551 Merge tag 'EditAliasBySelect01' into develop
Fix editing Alias: solo da SELECT
2024-04-24 07:34:08 +02:00
Samuele Locatelli b6c3fffe5b Merge branch 'release/EditAliasBySelect01' 2024-04-24 07:33:54 +02:00
Samuele Locatelli 9c026b0820 Update editing ALIAS 2024-04-24 07:33:26 +02:00
Samuele Locatelli 56bb1fcff1 update conf staging x provare in ufficio magman 2024-04-17 10:01:31 +02:00
Samuele Locatelli 134eb37a12 Merge tag 'AddCompBarre01' into develop
Aggiunta metodo comparazione barre (da testare)
2024-04-16 08:59:40 +02:00
Samuele Locatelli b301ada72e Merge branch 'release/AddCompBarre01' 2024-04-16 08:59:31 +02:00
Samuele Locatelli da3316f9cf Completato metodo dictComparer (da testare) 2024-04-16 08:58:57 +02:00
Samuele Locatelli d7ffd3111d Inizio modifiche controller API x check risorse 2024-04-15 20:22:51 +02:00
Samuele Locatelli 98cc38e338 Merge branch 'develop' into SDK 2024-04-15 20:22:30 +02:00
Samuele Locatelli 0918f7c58f update nuget comunicazione 2024-04-15 20:22:19 +02:00
Samuele Locatelli 4d24877c3e Merge branch 'develop' 2024-04-12 08:22:24 +02:00
Samuele Locatelli b0a61309ac Merge branch 'SDK' into develop 2024-04-12 08:22:11 +02:00
Samuele Locatelli ad3abbee06 Merge tag 'RemoveDbSetCountKeyless' into develop
Update db con rimozione DbSetCount Keyless
2024-04-12 08:21:54 +02:00
Samuele Locatelli 78dfc2b8eb Merge branch 'release/RemoveDbSetCountKeyless' 2024-04-12 08:21:34 +02:00
Samuele Locatelli 7555b89438 Rimozione tab DbSetCount keyless... 2024-04-12 08:21:05 +02:00
Samuele Locatelli c52438d0a4 Merge branch 'SDK' of https://gitlab.steamware.net/egalware-web/mes/wood/magman into SDK 2024-04-10 11:09:45 +02:00
Samuele Locatelli e8b0e75f2e Merge tag 'AddChechServerRetry' into develop
Aggiunto modalità "riprova e sarai + fortunato" per la gestione del test
server (ping)
2024-04-10 11:09:12 +02:00
Samuele Locatelli 703ffdb7a3 Merge branch 'release/AddChechServerRetry' 2024-04-10 11:08:45 +02:00
Samuele Locatelli a87494d6f0 Update metodo controllo server
- 5 tentativi (configurabili)
- tempo attesa 200ms tra prove (configurabile)
2024-04-10 11:08:09 +02:00
Samuele Locatelli bf12d27afb Merge tag 'AliasAddLogicalDelete02' into develop
Fix update aliast anche in lista
2024-04-04 12:35:16 +02:00
Samuele Locatelli 6b23b74917 Merge branch 'release/AliasAddLogicalDelete02' 2024-04-04 12:35:06 +02:00
Samuele Locatelli 752f902602 Fix update active alias anche x lista 2024-04-04 12:34:50 +02:00
Samuele Locatelli 5abaf08cf0 Merge tag 'AliasAddLogicalDelete' into develop
Gestione cancellazione logica da editing Alias su cloud
2024-04-04 12:19:03 +02:00
Samuele Locatelli f09c5f9d77 Merge branch 'release/AliasAddLogicalDelete' 2024-04-04 12:18:29 +02:00
Samuele Locatelli 4081b69aff Aggiunta gestione cancellazione logica 2024-04-04 12:18:19 +02:00
Samuele Locatelli bf5dd58364 Merge branch 'develop' into SDK 2024-04-04 11:54:34 +02:00
Samuele Locatelli 7bcb0a6c67 - Aggiunta migration x gestione nuovo campo alias
- update tracciati services x alias
2024-04-04 11:54:19 +02:00
Samuele Locatelli 129cb545e8 Modifica alias x bool gestione cancellazione logica 2024-04-04 11:53:53 +02:00
Samuele Locatelli 14f2be3725 Merge tag 'AddDtRifSyncroRes01' into develop
Aggiunto gestione DtRif x syncro invio risorse
2024-03-26 10:57:15 +01:00
Samuele Locatelli 0d49a4de41 Merge branch 'release/AddDtRifSyncroRes01' 2024-03-26 10:57:04 +01:00
Samuele Locatelli 5408f0995a Merge branch 'develop' into SDK 2024-03-26 10:56:32 +01:00
Samuele Locatelli dead2a06a3 Aggiunta dtRif in metodo invio sync 2024-03-26 10:56:21 +01:00
Samuele Locatelli 6bbe30e831 Merge branch 'SDK' into develop 2024-03-26 10:36:16 +01:00
Samuele Locatelli a920207ebe Update payload invio risorse:
- aggiunta dtReq x verifica se attivare o meno ultima richiesta
2024-03-26 10:33:28 +01:00
Samuele Locatelli 4512dace96 Merge branch 'develop' into SDK 2024-03-19 17:28:05 +01:00
Samuele Locatelli 687b736a50 Fix check server (ping a loopback di catch) 2024-03-19 17:27:48 +01:00
Samuele Locatelli ef54b8762b Merge tag 'FixMatItemEmptyDescr' into develop
Fix descrizioni vuote x progetti
2024-03-01 08:13:01 +01:00
Samuele Locatelli 954543feb4 Merge branch 'release/FixMatItemEmptyDescr' 2024-03-01 08:12:51 +01:00
Samuele Locatelli 495811fa26 Update controller RawItem + fix display proj 2024-03-01 08:12:20 +01:00
Samuele Locatelli c72756f25b Update metodi x calcolo descr materiale se mancante 2024-02-29 19:54:01 +01:00
Samuele Locatelli f0867272ec Fix gestione update risorse 2024-02-29 18:54:10 +01:00
Samuele Locatelli fd097d1472 Merge branch 'develop' into SDK 2024-02-29 12:51:34 +01:00
Samuele Locatelli 7848d7802b Update gestione ResourceTrack:
- update controller POST
- update lib SDK x syncro
2024-02-29 12:51:25 +01:00
Samuele Locatelli 749c4b4cc7 Merge branch 'develop' into SDK 2024-02-29 11:29:01 +01:00
Samuele Locatelli 95af7cc9b5 Update syncro x restituzione val INT 2024-02-29 11:28:55 +01:00
Samuele Locatelli b6d7b1e7b9 Merge tag 'Nuget_AddProjGetSingle' into develop
Aggiunta gestione nuget progetti x get single
2024-02-29 10:32:06 +01:00
Samuele Locatelli d59dea5c51 Merge branch 'release/Nuget_AddProjGetSingle' 2024-02-29 10:31:53 +01:00
Samuele Locatelli 6ea491284b Merge branch 'develop' into SDK 2024-02-29 10:30:47 +01:00
Samuele Locatelli 4eae0fa7ac Update SDK x nuget gestione syncro con single Proj get 2024-02-29 10:30:39 +01:00
Samuele Locatelli 3bd0806942 Aggiunta metodo x download singolo Proj da CloudId 2024-02-29 10:22:09 +01:00
Samuele Locatelli 35a6382f8a Merge branch 'main' into SDK 2024-02-29 08:49:23 +01:00
Samuele Locatelli 0f255e444b Merge tag 'UpgradeProjUpsert' into develop
Update x gestione Proj aggiornata in upsert e permettere nuovo SDK x
sync
2024-02-29 08:49:03 +01:00
Samuele Locatelli 62b14754cd Merge branch 'release/UpgradeProjUpsert' 2024-02-29 08:48:29 +01:00
Samuele Locatelli bd7a82d50f update metodi gestione Progetti:
- ritorno ID creato/aggiornato
- check funzioni insert/update
- REST refresh x testing
2024-02-29 08:47:58 +01:00
Samuele Locatelli 944ae6126c Merge tag 'AddAliasMan01' into develop
Gestione alias materiali online
2024-02-22 16:24:37 +01:00
Samuele Locatelli c276563d2f Merge branch 'release/AddAliasMan01' 2024-02-22 16:23:56 +01:00
Samuele Locatelli 3979d378b2 update index page 2024-02-22 16:23:36 +01:00
Samuele Locatelli 8959cb0751 Update gestione Alias 2024-02-22 16:20:51 +01:00
Samuele Locatelli 0785df95bf Merge branch 'develop' into SDK 2024-02-20 19:13:17 +01:00
Samuele Locatelli 438ade3a10 Update SDK methos AliasSendAsync name 2024-02-20 19:13:10 +01:00
Samuele Locatelli 13b904f61a Merge tag 'AddAliasSync' into develop
Completato update anche dell'SDK
2024-02-20 18:39:32 +01:00
Samuele Locatelli fcd7788a84 Merge branch 'release/AddAliasSync' 2024-02-20 18:39:21 +01:00
Samuele Locatelli 14e4b75b69 Update proxy con SDK 2024-02-20 18:39:10 +01:00
Samuele Locatelli a39a037aee Update x metodi gestione sync Alias 2024-02-20 18:19:09 +01:00
Samuele Locatelli c5f7a7d78e Merge tag 'AddForceReloadPage02' into develop
Fix reload page x blazor js
2024-02-19 19:57:00 +01:00
Samuele Locatelli b5fcf6cd4d Merge branch 'release/AddForceReloadPage02' 2024-02-19 19:56:51 +01:00
Samuele Locatelli bef5fdc203 Fix layout x reload blazor js 2024-02-19 19:56:36 +01:00
Samuele Locatelli f899ea5380 Merge tag 'AddForceReloadPage01' into develop
Update gestione force reload pagina per evitare reload waiting
2024-02-19 09:26:43 +01:00
Samuele Locatelli 87b5f37b5a Merge branch 'release/AddForceReloadPage01' 2024-02-19 09:26:28 +01:00
Samuele Locatelli 56de33cfc6 Fix force reload page 2024-02-19 09:24:34 +01:00
Samuele Locatelli 4aca1a465a Merge tag 'FixEditMaterials01' into develop
Fix editing materiali
2024-02-17 10:59:22 +01:00
Samuele Locatelli d5d28524bd Merge branch 'release/FixEditMaterials01' 2024-02-17 10:59:08 +01:00
Samuele Locatelli c67c37cd2c Fix catena selezione materiali 2024-02-17 10:58:31 +01:00
Samuele Locatelli 529179e581 Merge tag 'FixEditMaterialsOnCancel01' into develop
Fix gestone edit materiali su cancel
2024-02-16 18:50:23 +01:00
Samuele Locatelli 7635da616d Merge branch 'release/FixEditMaterialsOnCancel01' 2024-02-16 18:50:08 +01:00
Samuele Locatelli 7d9999b336 Update gestione exit edit Materiali 2024-02-16 18:49:18 +01:00
Samuele Locatelli 8918110dec Update gestione cancel edit materiali 2024-02-16 18:17:18 +01:00
Samuele Locatelli 287a9929b6 Merge tag 'InventoryFixUpdQtyOnlyCloud' into develop
Update gestione qty non aggiornata da EgtBW in sync
2024-02-14 15:09:50 +01:00
Samuele Locatelli dc0cb5fc69 Merge branch 'release/InventoryFixUpdQtyOnlyCloud' 2024-02-14 15:07:06 +01:00
Samuele Locatelli 147bd0dc9e Gestione opzionale set qty RawItem 2024-02-14 15:06:31 +01:00
Samuele Locatelli 75186f4628 Merge tag 'FixReloadSelCustomer' into develop
Fix refresh ceh eprde customer
2024-02-09 14:44:54 +01:00
Samuele Locatelli d9731433d1 Merge branch 'release/FixReloadSelCustomer' 2024-02-09 14:44:44 +01:00
Samuele Locatelli 1f75a0a39e Fix invio x merge itemRaw 2024-02-09 14:44:08 +01:00
Samuele Locatelli 9b32b9ae95 Merge tag 'fixAddDeleteRawItem' into develop
Aggiornamento insert/delete rawItem
2024-02-08 13:02:19 +01:00
Samuele Locatelli a58458b0e6 Merge branch 'release/fixAddDeleteRawItem' 2024-02-08 13:01:47 +01:00
Samuele Locatelli b466b3e8e5 Fix calcolo solo su attivi 2024-02-08 13:01:14 +01:00
Samuele Locatelli 86664908cb Fix display su cambio attivi (RawItem) 2024-02-08 12:43:51 +01:00
Samuele Locatelli f43acfd3ac Fix ItemRaw add 2024-02-08 11:24:34 +01:00
Samuele Locatelli 9bb42101ea Fix editing materiali 2024-02-08 10:23:06 +01:00
Samuele Locatelli 13dae1c425 Merge tag 'AddDeleteMatForAdmin' into develop
Aggiunta eliminazione materiali x admin
2024-02-08 09:09:13 +01:00
Samuele Locatelli 150916acbd Merge branch 'release/AddDeleteMatForAdmin' 2024-02-08 09:09:03 +01:00
Samuele Locatelli 08832c26f2 Update x gestione eliminazione record su MagMan 2024-02-08 09:08:42 +01:00
Samuele Locatelli f614d3df7f Merge branch 'SDK' into develop 2024-02-06 19:43:40 +01:00
Samuele Locatelli 786e850380 Update log invio in caso di problemi response 2024-02-06 19:43:31 +01:00
Samuele Locatelli ceadec4ae6 Merge branch 'develop' into SDK 2024-02-06 16:11:47 +01:00
Samuele Locatelli eb02173f67 Fix check bool fatto da statuscode 2024-02-06 16:11:42 +01:00
Samuele Locatelli 47bf84c5be Merge branch 'SDK' into develop 2024-02-06 15:54:54 +01:00
Samuele Locatelli acccb38a25 Update: ping con timeout pure lui 2024-02-06 15:54:46 +01:00
Samuele Locatelli abf8d30ecd Merge branch 'develop' into SDK 2024-02-06 15:48:32 +01:00
Samuele Locatelli ff066ddf1a Aggiunta override x timeout 2024-02-06 15:48:25 +01:00
Samuele Locatelli e51870a87b Merge tag 'SdkAddSyncroSyncAsync' into develop
Aggiunta metodi sync/async in SDK
2024-02-06 14:27:58 +01:00
Samuele Locatelli e1c3de8199 Merge branch 'release/SdkAddSyncroSyncAsync' 2024-02-06 14:27:48 +01:00
Samuele Locatelli 9a7e273fd5 Merge branch 'develop' into SDK 2024-02-06 14:27:13 +01:00
Samuele Locatelli 7d7bbf46c5 Update pacchetti DataSyncro x metodi Sync/Async 2024-02-06 14:27:06 +01:00
Samuele Locatelli 71ea0405d8 Merge tag 'FixuploadSdk' into develop
Fix tracciati upload SDK
2024-02-06 10:14:13 +01:00
Samuele Locatelli 4ce5157489 Merge branch 'release/FixuploadSdk' 2024-02-06 10:14:06 +01:00
Samuele Locatelli 162c6ff3a4 Merge branch 'develop' into SDK 2024-02-06 10:13:42 +01:00
Samuele Locatelli befbccc9a2 Fix chiamate REST di upload 2024-02-06 10:13:36 +01:00
Samuele Locatelli 6c84f84e53 Merge tag 'UpdMenuTopSpace01' into develop
Fix gestione spazio top menu
2024-02-06 08:45:47 +01:00
Samuele Locatelli 9a54256dbd Merge branch 'release/UpdMenuTopSpace01' 2024-02-06 08:45:38 +01:00
Samuele Locatelli c85f99bf10 Merge branch 'develop' into SDK 2024-02-06 08:44:56 +01:00
Samuele Locatelli 8d7d8d2f71 Fix header 2024-02-06 08:44:42 +01:00
Samuele Locatelli c01bf85968 Update SDK x gestione IP senza special port 2024-02-06 08:44:38 +01:00
Samuele Locatelli cec8aa22e4 Fix salvataggio pickup/deposit 2024-02-05 15:02:27 +01:00
Samuele Locatelli e6751ee3ba Fix display top, fix sel cliente 2024-02-05 15:02:19 +01:00
Samuele Locatelli 4055ce8426 Prima versione deposit/pickup da verificare 2024-02-02 19:38:42 +01:00
Samuele Locatelli e55610870c Merge tag 'AddSelNumKey' into develop
Aggiunta gestione NumKey via MessageService
2024-02-02 11:33:34 +01:00
Samuele Locatelli ddd7c1e98b Merge branch 'release/AddSelNumKey' 2024-02-02 11:31:51 +01:00
Samuele Locatelli f54e5702c2 Fix selezione key in cascata 2024-02-02 11:31:24 +01:00
Samuele Locatelli abd4f94279 Fix orientamento centrale QRCode JS 2024-02-02 09:13:21 +01:00
Samuele Locatelli 4b7097e941 Merge branch 'develop' into SDK 2024-01-31 08:53:28 +01:00
195 changed files with 14885 additions and 2034 deletions
+8 -3
View File
@@ -5,10 +5,9 @@
.vs/*
#--------------------------------
# area MP.Stats
# area .temp
#--------------------------------
/Mp.FileData/temp/*.csv
*.bak
.temp
#--------------------------------
# Area VersGen
@@ -163,12 +162,18 @@ publish/
# NuGet Packages
*.nupkg
# NuGet Symbol Packages
*.snupkg
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
# NuGet v3's project.json files produces more ignorable files
*.nuget.props
*.nuget.targets
# Windows Azure Build Output
csx/
+18 -15
View File
@@ -9,13 +9,22 @@ variables:
# helper x fix pacchetti nuget da repo locale nexus.steamware.net
.nuget-fix: &nuget-fix
- |
$hasSource = C:\Tools\nuget.exe sources list | find "`"Steamware Nexus`"" /C
if ($hasSource -eq 0) {
C:\Tools\nuget.exe sources Add -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
} else {
C:\Tools\nuget.exe sources Update -Name "`"Steamware Nexus`"" -Source https://nexus.steamware.net/repository/nuget-group -username "`"nugetUser`"" -password "`"viaDante16`""
echo "esecuzione Nuget FIX steps"
dotnet nuget list source
$hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus Proxy"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source "`"Steamware Nexus Proxy`""
}
echo $hasSource
$hasSource = dotnet nuget list source | Select-String -Pattern "Steamware Nexus"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source "`"Steamware Nexus`""
}
$hasSource = dotnet nuget list source | Select-String -Pattern "nexus-proxy-v3"
if (! [String]::IsNullOrWhiteSpace($hasSource)) {
dotnet nuget remove source nexus-proxy-v3
}
dotnet nuget add source https://nexus.steamware.net/repository/nuget-group-3/index.json -n "Steamware Nexus" -u nugetUser -p $NEXUS_PASSWD --store-password-in-clear-text
echo "Steamware Nexus Source added"
# helper creazione hash files
.hashBuild: &hashBuild
@@ -27,7 +36,6 @@ variables:
New-Item $Target".sha1"
$MD5.Hash | Set-Content -Path $Target".md5"
$SHA1.Hash | Set-Content -Path $Target".sha1"
echo "Created HASH files for $Target"
# helper x send su NEXUS
@@ -56,8 +64,6 @@ variables:
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\manifest.xml" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/manifest.xml
mCurl -v -u GitLab:$NEXUS_PASSWD --upload-file "Resources\ChangeLog.html" https://nexus.steamware.net/repository/SWS/$env:NEXUS_PATH/$version/LAST/ChangeLog.html
# mCurl -v -u $env:NEXUS_USER:$env:NEXUS_PASSWD --upload-file bin/release/$env:APP_NAME.zip $env:NEXUS_SERVER/utility/$env:NEXUS_PATH/$version/$env:APP_NAME-$version.zip
# helper x fix version number
.version-fix: &version-fix
- |
@@ -65,10 +71,6 @@ variables:
$env:NUM_REL = $env:VERS_MAIN+"."+(get-date -format yyMM)+"."+(get-date -format dHH)
$env:NUM_DEB = $env:VERS_MAIN+"."+(get-date -format yyMM)+"-beta."+(get-date -format dHH)
$env:NEW_COPYRIGHT = "EgalWare @ 2021-" + (get-date -format yyyy)
$contenuto = Get-Content -path 'VersGen\VersGen.cs' -Raw
$newContenuto = $contenuto -replace '0.0.0.0', $env:NEW_REL
$newContenuto = $newContenuto -replace 'EgalWare © 2021', $env:NEW_COPYRIGHT
$newContenuto | Set-Content -Path 'VersGen\VersGen.cs'
# display versioni generate
$resoconto = "Effettuato fix file VersGen | release v: " + $env:NUM_REL + " | debug v: " + $env:NUM_DEB;
Write-Output $resoconto;
@@ -98,7 +100,6 @@ variables:
Set-Content -Path $fileNameDeb -Value $nuspDataDebUpd;
echo "replace completati"
stages:
- build
- staging
@@ -162,6 +163,9 @@ EgwProxy.MagMan:staging:
- '& "$env:NUGET_PATH" push *$env:NUM_DEB.nupkg -Source http://nexus.steamware.net/repository/nuget-hosted'
# --------------------------------
# INSTALLER
# --------------------------------
installer:
stage: installer
tags:
@@ -184,7 +188,6 @@ installer:
# --------------------------------
# RELEASE
# --------------------------------
EgwProxy.MagMan:release:
stage: release
needs: ["EgwProxy.MagMan:build"]
+79
View File
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<entityFramework>
<!--<defaultConnectionFactory type="MySql.Data.Entity.MySqlConnectionFactory, MySql.Data.EntityFramework" />-->
<providers>
<!--<provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />-->
<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
</provider>
</providers>
</entityFramework>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.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="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.6.0" newVersion="1.8.6.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-7.0.0.3" newVersion="7.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.3.0" newVersion="4.1.3.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.26.1.0" newVersion="3.26.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="MySql.Data" publicKeyToken="c5687fc88969c44d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.3.0.0" newVersion="8.3.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="K4os.Compression.LZ4" publicKeyToken="2186fa9121ef231d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="K4os.Compression.LZ4.Streams" publicKeyToken="2186fa9121ef231d" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.3.8.0" newVersion="1.3.8.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.8.0.0" newVersion="0.8.0.0" />
</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="Renci.SshNet" publicKeyToken="1cee9f8bde3db106" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2020.0.2.0" newVersion="2020.0.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
@@ -0,0 +1,144 @@
using EgwProxy.DataLayer.DbModel;
using EgwProxy.MagMan.DTO;
using NLog;
using System;
using System.Collections.Generic;
using System.Collections.Concurrent;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using static System.Data.Entity.Infrastructure.Design.Executor;
namespace EgwProxy.DataLayer.Controllers
{
public class LogMachineController : IDisposable
{
#region Public Constructors
/// <summary>
/// Init classe
/// </summary>
/// <param name="connString"></param>
public LogMachineController()
{
}
#endregion Public Constructors
#region Public Methods
/// <summary>
/// Helper conversione a LogMachineDTO
/// </summary>
/// <param name="currRec"></param>
/// <returns></returns>
public static LogMachineDTO ConvToItemDto(LogMachineModel currRec)
{
LogMachineDTO answ = new LogMachineDTO()
{
DtEvent = currRec.DtEvent,
EvType = (MagMan.MachLogTypes)currRec.EvType,
ProjCloudId = currRec.ProjCloudId,
SupervId = currRec.SupervId,
VarValue = currRec.VarValue
};
return answ;
}
public void Dispose()
{
}
/// <summary>
/// Recupero i dati in ordine crescente fino al num max indicato
/// </summary>
/// <param name="numMax"></param>
/// <returns></returns>
public List<LogMachineModel> GetUnsentAsc(int numMax)
{
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
// retrieve
return localDbCtx
.DbSetLogMac
.Where(x => (x.DtSent == null || x.DtSent < x.DtEvent) && x.ProjCloudId > 0)
.OrderBy(x => x.DtEvent)
.Take(numMax)
.ToList();
}
}
/// <summary>
/// Aggiorna i record indicati inserendo dataora corrente x DtSent
/// </summary>
/// <param name="rec2upd"></param>
/// <returns></returns>
public bool SetDtSent(List<LogMachineModel> rec2upd)
{
bool done = false;
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
DateTime adesso = DateTime.Now;
foreach (var item in rec2upd)
{
var currRec = localDbCtx
.DbSetLogMac
.Where(x => (x.DtSent == null || x.DtSent < new DateTime(2000, 1, 1)) && x.LogDbId == item.LogDbId)
.FirstOrDefault();
if (currRec != null)
{
currRec.DtSent = adesso;
}
// indico modificato
localDbCtx.Entry(currRec).State = System.Data.Entity.EntityState.Modified;
}
// Salvataggio finale
localDbCtx.SaveChanges();
}
return done;
}
/// <summary>
/// Cerca di sistemare gli ID di Prod e ProjCloud mancanti
/// </summary>
/// <returns></returns>
public bool TryFixProjCloudId()
{
// init vars
bool fatto = false;
List<List<LogMachineModel>> listBatch = new List<List<LogMachineModel>>();
// vado sul DB
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
// retrieve
var list2proc = localDbCtx
.DbSetLogMac
.Where(x => x.ProjCloudId == 0 && ((int)x.EvType == 1 || (int)x.EvType == 2))
.OrderBy(x => x.DtEvent)
.ToList();
// se ci sono...
if (list2proc != null && list2proc.Count > 0)
{
// chiamo stored...
localDbCtx.Database.ExecuteSqlCommand("call stp_LogMachineFixPid");
}
}
// risultato
return fatto;
}
#endregion Public Methods
#region Private Fields
/// <summary>
/// Istanza logger
/// </summary>
private NLog.Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
}
}
@@ -0,0 +1,162 @@
using EgwProxy.DataLayer.DbModel;
using EgwProxy.MagMan.DTO;
using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer.Controllers
{
public class ProdController : IDisposable
{
#region Public Methods
/// <summary>
/// Helper conversione a ProjectDTO
/// </summary>
/// <param name="currRec">record in formato ProdModel</param>
/// <returns></returns>
public static ProjectDTO ConvToDto(ProdModel currRec)
{
// ho valori mancanti che saranno calcolati dal cloud e valori messi a zero di default
ProjectDTO answ = new ProjectDTO()
{
ProjCloudId = currRec.ProjCloudId,
ProjLocalId = currRec.ProdDbId,
ProjExtId = currRec.ProdId,
// è calcolato sul cloud, da token --> machine ID
MachineCloudId = 0,
// è calcolato sul cloud, da token --> KeyNum
KeyNum = 0,
// disponibile solo su PROJ
BTLFileName = "",
PType = (EgwProxy.MagMan.BWType)currRec.PType,
Machine = currRec.Machine,
ProjDescription = currRec.Description,
DtCreated = currRec.DtCreated,
DtLastAction = DateTime.MinValue,
DtSchedule = DateTime.MinValue,
DtStartProd = DateTime.MinValue,
// disponibile solo su PROJ
ListName = "",
ProcTimeEst = 0,
ProcTimeReal = 0,
IsActive = currRec.IsActive,
IsArchived = currRec.IsArchived
};
return answ;
}
public void Dispose()
{
}
/// <summary>
/// Get record by ProdId
/// </summary>
/// <param name="ProdId"></param>
/// <returns></returns>
public ProdModel FindByProdId(int ProdId)
{
ProdModel answ;
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
answ = localDbCtx
.DbSetProd
.Where(x => x.ProdId == ProdId)
.SingleOrDefault();
}
return answ;
}
/// <summary>
/// Recupero i dati NON sincronizzati in ordine crescente fino al num max indicato
/// </summary>
/// <param name="dtStart"></param>
/// <param name="dtEnd"></param>
/// <returns></returns>
public List<ProdModel> GetUnsentAsc()
{
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
// retrieve
return localDbCtx
.DbSetProd
.Where(x => x.ProjCloudId == 0)
.OrderBy(x => x.ProdDbId)
.ToList();
}
}
/// <summary>
/// Update record su DB x ProjectCloudId
/// </summary>
/// <param name="ProdId"></param>
/// <param name="Description"></param>
/// <returns></returns>
public ProdModel UpdateCloudId(int ProdId, int ProjCloudId)
{
// cerco specifico Proj
ProdModel currData;
using (DatabaseContext localDbCtx = new DatabaseContext(DbConfig.CONNECTION_STRING))
{
currData = localDbCtx
.DbSetProd
.Where(x => x.ProdId == ProdId)
.SingleOrDefault();
if (currData != null)
{
try
{
// aggiorno valore BTL
currData.ProjCloudId = ProjCloudId;
// salvo record PROD
localDbCtx.SaveChanges();
// cerco se ci siano projects collegati ed aggiorno pure loro...
var projList = localDbCtx
.DbSetProj
.Where(x => x.ProdDbId == currData.ProdDbId)
.ToList();
if (projList != null)
{
foreach (var item in projList)
{
item.ProjCloudId = ProjCloudId;
}
// salvo modifihce ai PROJ
localDbCtx.SaveChanges();
}
}
catch (Exception exc)
{
string errMessage = $"EXCEPTION on Prod.UpdateCloudId:{Environment.NewLine}{exc}";
Console.WriteLine(errMessage);
Log.Error(errMessage);
}
}
else
{
string errMessage = $"ERROR on Prod.UpdateCloudId: req item was not found | ProdId {ProdId} | ProjCloudId {ProjCloudId}";
Console.WriteLine(errMessage);
Log.Error(errMessage);
}
}
return currData;
}
#endregion Public Methods
#region Private Fields
/// <summary>
/// Istanza logger
/// </summary>
private NLog.Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
}
}
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer.Core
{
public class MachLog
{
public enum MachLogTypes
{
NULL = 0
, PART_STATUS = 1
, MACHGROUP_STATUS = 2
, MACHINE_MODE = 3
, MACHINE_STATUS = 4
, MACHINE_COMMAND = 5
, READ_VAR = 6
, WRITE_VAR = 7
, ALARM = 8
, OPERATOR_MSG = 9
, PROGRAM_SEND = 10
}
}
}
+44
View File
@@ -0,0 +1,44 @@
using EgwProxy.DataLayer.DbModel;
using MySql.Data.EntityFramework;
using NLog;
using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer
{
[DbConfigurationType(typeof(MySqlEFConfiguration))]
public partial class DatabaseContext : DbContext
{
#region Public Constructors
public DatabaseContext(string currConnString) : base(currConnString)
{
connString = currConnString;
}
#endregion Public Constructors
#region Public Properties
public virtual DbSet<LogMachineModel> DbSetLogMac { get; set; }
public DbSet<ProdModel> DbSetProd { get; set; }
public DbSet<ProjModel> DbSetProj { get; set; }
#endregion Public Properties
#region Private Fields
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
private string connString = "";
#endregion Private Fields
}
}
+35
View File
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer
{
public static class DbConfig
{
public static string DATABASE_NAME = "EgtBwDb";
public static int DATABASE_PROCESS_TIMEOUT = 5;
public static string DATABASE_PWD = "viacremasca";
// Database config
public static string DATABASE_SERV = "127.0.0.1";
public static string DATABASE_USER = "EgtUser";
/// <summary>
/// DB Connection string per azioni amministrative:
/// aggiunto parametro "allow user variables", da https://forums.mysql.com/read.php?38,609672,610320#msg-610320
/// </summary>
public static string ADMIN_CONNECTION_STRING { get; set; } = "";
/// <summary>
/// DB Connection string, per effettuare migration riportare valore connessione admin cablato
/// DB Manu: server=localhost;port=3306;database=EgtBwDb_000102;uid=root;pwd=Egalware_24068!;
/// DB Sam: server=localhost;port=3306;database=EgtBwDb_000470;uid=root;pwd=Egalware_24068!;
/// DB Lovato: server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!;
/// </summary>
public static string CONNECTION_STRING { get; set; } = "server=localhost;port=3306;database=EgtBwDb_000656;uid=root;pwd=Egalware_24068!";
}
}
@@ -0,0 +1,68 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace EgwProxy.DataLayer.DbModel
{
/// <summary>
/// Tabella dei LOG Macchina
/// </summary>
[Table("LogMachine")]
public class LogMachineModel
{
#region Public Properties
/// <summary>
/// Chiave primaria evento LOG
/// </summary>
[Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int LogDbId { get; set; }
/// <summary>
/// Stato da enum Core
/// </summary>
[Column("EvType")]
public Core.MachLog.MachLogTypes EvType { get; set; } = Core.MachLog.MachLogTypes.NULL;
/// <summary>
/// Data Evento
/// </summary>
[Column("DtEvent")]
public DateTime DtEvent { get; set; } = DateTime.Now;
/// <summary>
/// Key prod attivo (DB locale)
/// </summary>
[Column("ProdId")]
public int ProdId { get; set; } = 0;
/// <summary>
/// Key progetto (cloud)
/// </summary>
[Column("ProjCloudId")]
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// ID Supervisore (Indirizzo VAR)
/// </summary>
[Column("SupervId")]
public string SupervId { get; set; } = "";
/// <summary>
/// Valore VAR (oggetto del log da decodificare)
/// </summary>
[Column("VarValue")]
public string VarValue { get; set; } = "";
/// <summary>
/// Data di invio evento (su cloud)
/// </summary>
[Column("DtSent")]
public DateTime? DtSent { get; set; } = null;
#endregion Public Properties
}
}
+119
View File
@@ -0,0 +1,119 @@
using EgwProxy.MagMan;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer.DbModel
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
/// <summary>
/// Tabella deiu raggruppamenti PROJ in forma di PROD
/// </summary>
[Table("ProdList")]
public class ProdModel
{
#region Public Properties
public ProdModel()
{
ProjListNav = new HashSet<ProjModel>();
}
/// <summary>
/// Chiave univoca DB
/// </summary>
[Key, Column("ProdDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int ProdDbId { get; set; }
[Column("Description")]
public string Description { get; set; } = "";
/// <summary>
/// Data Creazione
/// </summary>
[Index]
[Column("DtCreated")]
public DateTime DtCreated { get; set; }
/// <summary>
/// Stato NEW = creato ma NON salvato
/// </summary>
[Column("IsNew")]
public bool IsNew { get; set; } = true;
/// <summary>
/// Stato locked, quando aperto da un dispositivo in rete
/// </summary>
[Column("Lock")]
public bool Locked { get; set; } = false;
/// <summary>
/// Chiave univoca per EgtBM
/// </summary>
[Column("Id")]
[Index]
public int ProdId { get; set; }
/// <summary>
/// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Tipologia del progetto (Travi, Pareti, ...)
/// </summary>
public BWType PType { get; set; } = BWType.NULL;
/// <summary>
/// Macchina
/// </summary>
[Column("Machine")]
public string Machine { get; set; } = "";
/// <summary>
/// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
/// </summary>
[Column("LockedBy")]
public string LockedBy { get; set; } = "";
/// <summary>
/// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un dispositivo in rete
/// </summary>
[Column("LockDate")]
public DateTime LockDate { get; set; } = DateTime.MinValue;
/// <summary>
/// Record attivo (se false == cancellazione logica)
/// </summary>
[Index]
[Column("IsDeleted")]
public bool IsActive { get; set; } = true;
/// <summary>
/// Stato Prodotto = inviato ALMENO UNA VOLTA al supervisore --> NON eliminabile se non in modo logico
/// </summary>
[Index]
[Column("IsProduced")]
public bool IsProduced { get; set; } = false;
/// <summary>
/// Stato Archiviato = NON visualizzabile normalmente, già prodotto
/// </summary>
[Index]
[Column("IsArchived")]
public bool IsArchived { get; set; } = false;
/// <summary>
/// Collezione oggetti Proj associati (almeno 1 by design)
/// </summary>
public virtual ICollection<ProjModel> ProjListNav { get; set; }
#endregion Public Properties
}
}
+125
View File
@@ -0,0 +1,125 @@
using EgwProxy.MagMan;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.DataLayer.DbModel
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
/// <summary>
/// Tabella dei PROJ caricati dal BTL
/// </summary>
[Table("ProjList")]
public class ProjModel
{
#region Public Properties
[Key, Column("ProjDbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int ProjDbId { get; set; }
[Column("BTLFileName")]
public string BTLFileName { get; set; } = "";
/// <summary>
/// Data Creazione
/// </summary>
[Column("DtCreated")]
[Index]
public DateTime DtCreated { get; set; }
/// <summary>
/// Data Esportazione
/// </summary>
[Column("DtExported")]
[Index]
public DateTime DtExported { get; set; }
/// <summary>
/// Stato NEW = creato ma NON salvato
/// </summary>
[Index]
[Column("IsNew")]
public bool IsNew { get; set; } = true;
/// <summary>
/// ListName del BTL
/// </summary>
[Column("ListName")]
public string ListName { get; set; } = "";
/// <summary>
/// Stato locked (quando aperto da un dispositivo in rete)
/// </summary>
[Column("Lock")]
public bool Locked { get; set; } = false;
[Column("ProdDbId")]
public int? ProdDbId { get; set; }
/// <summary>
/// ID da modello ext
/// </summary>
[Column("Id")]
[Index]
public int ProjId { get; set; }
/// <summary>
/// Codice Proj per sync info (Identificativo DB esterno del magazzino in sync)
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Tipologia del progetto (Travi, Pareti, ...)
/// </summary>
public BWType PType { get; set; } = BWType.NULL;
/// <summary>
/// Macchina
/// </summary>
[Column("Machine")]
public string Machine { get; set; } = "";
/// <summary>
/// ID utente che ha bloccato (NumKey), quando aperto da un dispositivo in rete
/// </summary>
[Column("LockedBy")]
public string LockedBy { get; set; } = "";
/// <summary>
/// DataOra ultima operazione di Lock (o di rimozione di lock), quando aperto da un
/// dispositivo in rete
/// </summary>
[Column("LockDate")]
public DateTime LockDate { get; set; } = DateTime.MinValue;
/// <summary>
/// Record attivo (se false == cancellazione logica)
/// </summary>
[Index]
[Column("IsDeleted")]
public bool IsActive { get; set; } = true;
/// <summary>
/// Descrizione progetto (copiata da BTLFileName inizialmente)
/// </summary>
[Column("ProjDescription")]
public string ProjDescription { get; set; } = "";
/// <summary>
/// Stato Archiviato = NON visualizzabile normalmente, già prodotto
/// </summary>
[Index]
[Column("IsArchived")]
public bool IsArchived { get; set; } = false;
[ForeignKey("ProdDbId")]
public virtual ProdModel Prod { get; set; }
#endregion Public Properties
}
}
@@ -0,0 +1,150 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{87935FC9-C1BC-4984-83CA-A9EDABBE2228}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>EgwProxy.DataLayer</RootNamespace>
<AssemblyName>EgwProxy.DataLayer</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
<HintPath>..\packages\BouncyCastle.Cryptography.2.3.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
</Reference>
<Reference Include="Google.Protobuf, Version=3.26.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
<HintPath>..\packages\Google.Protobuf.3.26.1\lib\net45\Google.Protobuf.dll</HintPath>
</Reference>
<Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
</Reference>
<Reference Include="K4os.Compression.LZ4.Streams, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Compression.LZ4.Streams.1.3.8\lib\net462\K4os.Compression.LZ4.Streams.dll</HintPath>
</Reference>
<Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
<HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="MySql.Data, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.8.3.0\lib\net462\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="MySql.Data.EntityFramework, Version=8.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<HintPath>..\packages\MySql.Data.EntityFramework.8.3.0\lib\net462\MySql.Data.EntityFramework.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.3.1\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="Renci.SshNet, Version=2020.0.2.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
<HintPath>..\packages\SSH.NET.2020.0.2\lib\net40\Renci.SshNet.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.ConfigurationManager, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Configuration.ConfigurationManager.4.4.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Configuration.Install" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.7.0.2\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.Drawing.Design" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.IO.Pipelines, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Management" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<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=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
<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>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="ZstdSharp, Version=0.8.0.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
<HintPath>..\packages\ZstdSharp.Port.0.8.0\lib\net462\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Controllers\LogMachineController.cs" />
<Compile Include="Controllers\ProdController.cs" />
<Compile Include="Core\MachLog.cs" />
<Compile Include="DatabaseContext.cs" />
<Compile Include="DbConfig.cs" />
<Compile Include="DbModel\LogMachineModel.cs" />
<Compile Include="DbModel\ProdModel.cs" />
<Compile Include="DbModel\ProjModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\EgwProxy.MagMan\EgwProxy.MagMan.csproj">
<Project>{1696d7a5-765a-4d25-8d29-ca7345023479}</Project>
<Name>EgwProxy.MagMan</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
<Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
</Target>
<Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
</Project>
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("EgwProxy.DataLayer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("EgwProxy.DataLayer")]
[assembly: AssemblyCopyright("Copyright © 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("87935fc9-c1bc-4984-83ca-a9edabbe2228")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+24
View File
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BouncyCastle.Cryptography" version="2.3.0" targetFramework="net472" />
<package id="EntityFramework" version="6.4.4" targetFramework="net472" />
<package id="Google.Protobuf" version="3.26.1" targetFramework="net472" />
<package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net472" />
<package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net472" />
<package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net472" />
<package id="MySql.Data" version="8.3.0" targetFramework="net472" />
<package id="MySql.Data.EntityFramework" version="8.3.0" targetFramework="net472" />
<package id="NLog" version="5.3.1" targetFramework="net472" />
<package id="Portable.BouncyCastle" version="1.9.0" targetFramework="net472" />
<package id="SSH.NET" version="2020.0.2" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Configuration.ConfigurationManager" version="4.4.1" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="7.0.2" targetFramework="net472" />
<package id="System.IO.Pipelines" version="6.0.3" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
<package id="ZstdSharp.Port" version="0.8.0" targetFramework="net472" />
</packages>
+6
View File
@@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwProxy.MagMan", "EgwProxy
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "TestWinFormVB", "TestWinFormVB\TestWinFormVB.vbproj", "{665C94F5-27A6-4CD0-9487-036D199CDC47}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EgwProxy.DataLayer", "EgwProxy.DataLayer\EgwProxy.DataLayer.csproj", "{87935FC9-C1BC-4984-83CA-A9EDABBE2228}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -27,6 +29,10 @@ Global
{665C94F5-27A6-4CD0-9487-036D199CDC47}.Debug|Any CPU.Build.0 = Debug|Any CPU
{665C94F5-27A6-4CD0-9487-036D199CDC47}.Release|Any CPU.ActiveCfg = Release|Any CPU
{665C94F5-27A6-4CD0-9487-036D199CDC47}.Release|Any CPU.Build.0 = Release|Any CPU
{87935FC9-C1BC-4984-83CA-A9EDABBE2228}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87935FC9-C1BC-4984-83CA-A9EDABBE2228}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87935FC9-C1BC-4984-83CA-A9EDABBE2228}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87935FC9-C1BC-4984-83CA-A9EDABBE2228}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.MagMan.DTO
{
public class AliasDTO
{
/// <summary>
/// Codice originale (da trasformare)
/// </summary>
public string ValOrig { get; set; } = "";
/// <summary>
/// Codice Alias in cui viene convertito
/// </summary>
public string ValAlias { get; set; } = "";
/// <summary>
/// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto)
/// </summary>
public bool IsActive { get; set; } = true;
}
}
+5
View File
@@ -25,6 +25,11 @@
/// </summary>
public int RawItemLocalId { get; set; } = 0;
/// <summary>
/// Boolean for logical delete
/// </summary>
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
/// </summary>
+37
View File
@@ -0,0 +1,37 @@
using System;
namespace EgwProxy.MagMan.DTO
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
public class LogMachineDTO
{
/// <summary>
/// Key progetto (DB) / CLOUD
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Stato da enum
/// </summary>
public MachLogTypes EvType { get; set; } = MachLogTypes.NULL;
/// <summary>
/// Data Evento
/// </summary>
public DateTime DtEvent { get; set; } = DateTime.Now;
/// <summary>
/// ID Supervisore (Indirizzo VAR)
/// </summary>
public string SupervId { get; set; } = "";
/// <summary>
/// Valore VAR (oggetto del log da decodificare)
/// </summary>
public string VarValue { get; set; } = "";
}
}
+7 -1
View File
@@ -50,7 +50,13 @@ namespace EgwProxy.MagMan.DTO
/// <summary>
/// Quantità totale in giacenza
/// </summary>
public int QtyTot { get; set; } = 0;
public decimal QtyTot { get; set; } = 0;
public string UM
{
get => IsBeam ? "m" : "m2";
}
/// <summary>
/// Codice QR/Matrix materiale
+36
View File
@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace EgwProxy.MagMan.DTO
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
public class ProjectProgrDTO
{
/// <summary>
/// Key progetto (DB) / CLOUD
/// </summary>
public int ProjCloudId { get; set; }
/// <summary>
/// Avanzamento (tipicamente barre fatte)
/// </summary>
public double ValAct { get; set; } = 0;
/// <summary>
/// Valore finale atteso (tipicamente barre da fare)
/// </summary>
public double ValMax { get; set; } = 1;
/// <summary>
/// Tempo lavorazione reale in minuti (parziale o totale se chiuso/completato/archiviato)
/// </summary>
public double ProcTimeReal { get; set; } = 0;
}
}
+2 -2
View File
@@ -68,8 +68,8 @@ namespace EgwProxy.MagMan.DTO
public DateTime DtRequest { get; set; }
/// <summary>
/// Record attivo (se false == NON è il piano scelto per i casi "previsionali" = ReqState >0 )
/// record richiesto (me lo aspetto sempre a false se viene inviato/registrato...)
/// </summary>
public bool IsActive { get; set; } = true;
public bool IsDeleted { get; set; } = false;
}
}
File diff suppressed because it is too large Load Diff
+16 -8
View File
@@ -31,20 +31,25 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=110.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.110.2.0\lib\net471\RestSharp.dll</HintPath>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.0.1\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="RestSharp, Version=111.2.0.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
<HintPath>..\packages\RestSharp.111.2.0\lib\net471\RestSharp.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
@@ -55,11 +60,11 @@
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encodings.Web, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
<Reference Include="System.Text.Json, Version=7.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll</HintPath>
<Reference Include="System.Text.Json, Version=8.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Json.8.0.3\lib\net462\System.Text.Json.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>
@@ -77,9 +82,12 @@
</ItemGroup>
<ItemGroup>
<Compile Include="DataSyncro.cs" />
<Compile Include="DTO\AliasDTO.cs" />
<Compile Include="DTO\ItemDTO.cs" />
<Compile Include="DTO\MaterialDTO.cs" />
<Compile Include="DTO\ProjectDTO.cs" />
<Compile Include="DTO\LogMachineDTO.cs" />
<Compile Include="DTO\ProjectProgrDTO.cs" />
<Compile Include="DTO\ResourceDTO.cs" />
<Compile Include="DTO\ResourceExpDTO.cs" />
<Compile Include="Enums.cs" />
+21 -1
View File
@@ -12,27 +12,47 @@ namespace EgwProxy.MagMan
BEAM = 1,
WALL = 2
}
public enum MachLogTypes
{
NULL = 0
, PART_STATUS = 1
, MACHGROUP_STATUS = 2
, MACHINE_MODE = 3
, MACHINE_STATUS = 4
, MACHINE_COMMAND = 5
, READ_VAR = 6
, WRITE_VAR = 7
, ALARM = 8
, OPERATOR_MSG = 9
, PROGRAM_SEND = 10
}
public enum ProjResState
{
/// <summary>
/// Registrazione consumo effettivo (update giacenza su tab RawItemList)
/// </summary>
Consumed = -1,
/// <summary>
/// Non definito
/// </summary>
ND = 0,
/// <summary>
/// Consumo stimato da nesting (solo simulazione)
/// </summary>
Estimated,
/// <summary>
/// Consumo confermato (da ordinare)
/// </summary>
Confirmed,
/// <summary>
/// Riservato (utile x calcolo quantità da ordinare)
/// </summary>
Reserved
}
}
}
+87 -9
View File
@@ -9,42 +9,120 @@ namespace EgwProxy.MagMan
{
public class RestPayload
{
public class Materials
#region Public Classes
public class Alias
{
#region Public Properties
/// <summary>
/// Elenco materiali x invio POST
/// Elenco decodifica Alias Materiali x invio POST
/// </summary>
public List<MaterialDTO> MatList { get; set; }
public List<AliasDTO> AliasList { get; set; } = new List<AliasDTO>();
#endregion Public Properties
}
#if false
public class Items
{
#region Public Properties
/// <summary>
/// Elenco Items x invio POST
/// </summary>
public List<ItemDTO> ItemList { get; set; }
}
#endif
#endregion Public Properties
}
public class LogData
{
#region Public Properties
/// <summary>
/// Elenco record log x invio POST
/// </summary>
public List<LogMachineDTO> LogList { get; set; }
#endregion Public Properties
}
public class Materials
{
#region Public Properties
/// <summary>
/// Elenco materiali x invio POST
/// </summary>
public List<MaterialDTO> MatList { get; set; }
#endregion Public Properties
}
public class PeriodData
{
#region Public Properties
public DateTime DtEnd { get; set; } = DateTime.Now;
public DateTime DtStart { get; set; } = DateTime.Now;
#endregion Public Properties
}
public class ProdInfoData
{
#region Public Properties
public ProjectProgrDTO ProjectProgress { get; set; }
#endregion Public Properties
}
public class Projects
{
#region Public Properties
public ProjectDTO Project { get; set; }
#endregion Public Properties
}
public class ProjStatusData
{
#region Public Properties
public Dictionary<int, bool> ProjStatusList { get; set; }
#endregion Public Properties
}
public class Resources
{
#region Public Properties
/// <summary>
/// ID progetto univoco esterno (da associare a KEY)
/// DataOra richiesta (data-ora del client)
/// </summary>
public int ProjExtDbId { get; set; } = 0;
public DateTime DtReq { get; set; } = DateTime.Now;
/// <summary>
/// ID progetto univoco su Cloud
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Tipo di registrazione dato inviata (previsione consumo, consumo effettivo...)
/// </summary>
public ProjResState ReqState { get; set; } = ProjResState.ND;
/// <summary>
/// Elenco Risorse x invio POST
/// </summary>
public List<ResourceDTO> ResourceList { get; set; }
#endregion Public Properties
}
#endregion Public Classes
}
}
}
+5 -4
View File
@@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net472" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net472" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
<package id="RestSharp" version="110.2.0" targetFramework="net472" />
<package id="NLog" version="5.0.1" targetFramework="net472" />
<package id="RestSharp" version="111.2.0" targetFramework="net472" />
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
<package id="System.Text.Encodings.Web" version="7.0.0" targetFramework="net472" />
<package id="System.Text.Json" version="7.0.3" targetFramework="net472" />
<package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net472" />
<package id="System.Text.Json" version="8.0.3" targetFramework="net472" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
</packages>
+26
View File
@@ -0,0 +1,26 @@
# Note ed utility per GIT
Comandi utili x GIT.
Ad esempio per semplificare il processo di creazione del changelog (allegato al file readme del progetto e in versione ridotta nel sw)
```bash
git log --branches --remotes --full-history --date-order --format='%ai%d %an <%ae> | %h | %f' > .temp/CommitLogHistory.txt
```
Questo produrrà un file come il seguente
```csv
2024-07-30 15:02:15 +0200 (HEAD -> develop, origin/develop) Samuele Locatelli <samuele@steamware.net> | 0cebf0a | Merge-tag-FixRedisMasterFlush01-into-develop
2024-07-30 15:02:08 +0200 (tag: FixRedisMasterFlush01, origin/main, origin/HEAD, main) Samuele Locatelli <samuele@steamware.net> | 46a0c55 | Merge-branch-release-FixRedisMasterFlush01
2024-07-30 15:01:41 +0200 Samuele Locatelli <samuele@steamware.net> | e8b9770 | Completato-review-gestione-cache-redis-x-MagMan
2024-07-30 14:44:38 +0200 Samuele Locatelli <samuele@steamware.net> | 6bd3686 | Continuo-riscrittura-metodi-gestione-redis-cache-su-classi-separate
2024-07-29 09:41:05 +0200 Samuele Locatelli <samuele@steamware.net> | 83ed7d9 | Merge-tag-TestSentinelGalera01-into-develop
2024-07-29 09:40:00 +0200 (tag: TestSentinelGalera01) Samuele Locatelli <samuele@steamware.net> | 9054d42 | Merge-branch-release-TestSentinelGalera01
2024-07-29 09:39:26 +0200 Samuele Locatelli <samuele@steamware.net> | 08e54ff | Update-conf-x-usare-sentinel-localhost-e-db-locale-galera-cluster
```
Che poi si può usare x generare un chagnelog accurato
PS: il file è escluso da gitignore come tutti quelli in folder .temp
BIN
View File
Binary file not shown.
+8
View File
@@ -20,5 +20,13 @@ namespace MagMan.Core
public const string redisBaseAddr = "MagManUi";
public const string rKeyConfig = $"{redisBaseAddr}:Cache";
// REDIS Channels messaggi x QueueMan
public static readonly string Q_MMAN_GEN = $"MagManGeneral";
public static readonly string Q_MMAN_ALIAS_MAT = $"MagManAliasMaterial";
public static readonly string Q_MMAN_INVE = $"MagManInve";
public static readonly string Q_MMAN_LOG = $"MagManLog";
public static readonly string Q_MMAN_PROJ = $"MagManProj";
public static readonly string Q_MMAN_RES = $"MagManRes";
}
}
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Core.DTO
{
public class AliasDTO
{
/// <summary>
/// Codice originale (da trasformare)
/// </summary>
public string ValOrig { get; set; } = "";
/// <summary>
/// Codice Alias in cui viene convertito
/// </summary>
public string ValAlias { get; set; } = "";
/// <summary>
/// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto)
/// </summary>
public bool IsActive { get; set; } = true;
}
}
+5
View File
@@ -32,6 +32,11 @@ namespace MagMan.Core.DTO
/// </summary>
public int RawItemLocalId { get; set; } = 0;
/// <summary>
/// Boolean for logical delete
/// </summary>
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
/// </summary>
+41
View File
@@ -0,0 +1,41 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Core.DTO
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
public class LogMachineDTO
{
/// <summary>
/// Key progetto (DB) / CLOUD
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Stato da enum
/// </summary>
public Enums.MachLogTypes EvType { get; set; } = Enums.MachLogTypes.NULL;
/// <summary>
/// Data Evento
/// </summary>
public DateTime DtEvent { get; set; } = DateTime.Now;
/// <summary>
/// ID Supervisore (Indirizzo VAR)
/// </summary>
public string SupervId { get; set; } = "";
/// <summary>
/// Valore VAR (oggetto del log) da decodificare
/// </summary>
public string VarValue { get; set; } = "";
}
}
+7 -2
View File
@@ -48,9 +48,14 @@ namespace MagMan.Core.DTO
public int SizeNum { get; set; } = 0;
/// <summary>
/// Quantità totale in giacenza
/// Quantità totale in giacenza, come lunghezza (m) se barre o area (m2) se pareti
/// </summary>
public int QtyTot { get; set; } = 0;
public decimal QtyTot { get; set; } = 0;
public string UM
{
get => IsBeam ? "m" : "m2";
}
/// <summary>
/// Codice materiale x QR/Datamatrix
+1 -1
View File
@@ -46,7 +46,7 @@ namespace MagMan.Core.DTO
/// <summary>
/// Data di schedulazione (prevista)
/// </summary>
public DateTime DtSchedule { get; set; } = DateTime.Today.AddMonths(3);
public DateTime DtSchedule { get; set; } = DateTime.MinValue;
/// <summary>
/// Data Inizio Produzione
+32
View File
@@ -0,0 +1,32 @@
using static MagMan.Core.Enums;
namespace MagMan.Core.DTO
{
// <Auto-Generated>
// This is here so CodeMaid doesn't reorganize this document
// </Auto-Generated>
public class ProjectProgrDTO
{
/// <summary>
/// Key progetto (DB) / CLOUD
/// </summary>
public int ProjCloudId { get; set; }
/// <summary>
/// Avanzamento (tipicamente barre fatte)
/// </summary>
public double ValAct { get; set; } = 0;
/// <summary>
/// Valore finale atteso (tipicamente barre da fare)
/// </summary>
public double ValMax { get; set; } = 1;
/// <summary>
/// Tempo lavorazione reale in minuti (parziale o totale se chiuso/completato/archiviato)
/// </summary>
public double ProcTimeReal { get; set; } = 0;
}
}
+2 -2
View File
@@ -66,8 +66,8 @@
public DateTime DtRequest { get; set; }
/// <summary>
/// Richiesta attiva (se false == NON è il piano scelto per i casi "previsionali" = ReqState >0 )
/// record richiesto (me lo aspetto sempre a false se viene inviato/registrato...)
/// </summary>
public bool IsActive { get; set; } = true;
public bool IsDeleted { get; set; } = false;
}
}
+22 -2
View File
@@ -22,37 +22,57 @@ namespace MagMan.Core
Request,
}
public enum MachLogTypes
{
NULL = 0
, PART_STATUS = 1
, MACHGROUP_STATUS = 2
, MACHINE_MODE = 3
, MACHINE_STATUS = 4
, MACHINE_COMMAND = 5
, READ_VAR = 6
, WRITE_VAR = 7
, ALARM = 8
, OPERATOR_MSG = 9
, PROGRAM_SEND = 10
}
public enum ProjResState
{
/// <summary>
/// Registrazione consumo effettivo (update giacenza su tab RawItemList)
/// </summary>
Consumed = -1,
/// <summary>
/// Non definito
/// </summary>
ND = 0,
/// <summary>
/// Consumo stimato da nesting (solo simulazione)
/// </summary>
Estimated,
/// <summary>
/// Consumo confermato (da ordinare)
/// </summary>
Confirmed,
/// <summary>
/// Riservato (utile x calcolo quantità da ordinare)
/// </summary>
Reserved
}
#if false
public enum ResultTypes
{
NULL = 0,
EXECUTED = 1,
RESULT = 2
}
}
#endif
#endregion Public Enums
}
+4 -2
View File
@@ -4,15 +4,17 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
</ItemGroup>
</Project>
+152
View File
@@ -0,0 +1,152 @@
using NLog;
using StackExchange.Redis;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Core
{
public class MessagePipe
{
#region Public Constructors
public MessagePipe(IConnectionMultiplexer redisConn, string channelName, bool enableLog = false)
{
_channel = new RedisChannel(channelName, RedisChannel.PatternMode.Literal); ;
redis = redisConn;
redisDb = redis.GetDatabase();
this.enableLog = enableLog;
// aggiungo sottoscrittore
setupSubscriber();
}
#endregion Public Constructors
#region Public Events
public event EventHandler EA_NewMessage = delegate { };
#endregion Public Events
#region Public Methods
/// <summary>
/// Invio messaggio sul canale + salvataggio in cache REDIS
/// </summary>
/// <param name="memKey">Chiave REDIS x salvare valore</param>
/// <param name="message"></param>
public bool saveAndSendMessage(string memKey, string message)
{
bool answ = false;
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
// invio notifica tramite il canale richiesto
answ = sendMessage(message);
if (redisDb != null)
{
redisDb.StringSetAsync(memKey, message);
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
if (numSent.ContainsKey(memKey))
{
numSent[memKey]++;
}
else
{
numSent.Add(memKey, 1);
}
if (enableLog || numSent[memKey] > 30)
{
Log.Info($"saveAndSendMessage| mKey {memKey} x {numSent[memKey]} | {message.Length} size | {ts.TotalMilliseconds} ms");
numSent[memKey] = 0;
}
return answ;
}
/// <summary>
/// Invio messaggio sul canale
/// </summary>
/// <param name="newMess"></param>
/// <returns></returns>
public bool sendMessage(string newMess)
{
bool answ = false;
ISubscriber sub = redis.GetSubscriber();
sub.Publish(_channel, newMess);
return answ;
}
#endregion Public Methods
#region Protected Fields
protected static Logger Log = LogManager.GetCurrentClassLogger();
#endregion Protected Fields
#region Private Fields
private bool enableLog = false;
private Dictionary<string, int> numSent = new Dictionary<string, int>();
private IConnectionMultiplexer redis;
private IDatabase? redisDb;
#endregion Private Fields
#region Private Properties
/// <summary>
/// Canale associato al gestore pipeline messaggi
/// </summary>
private RedisChannel _channel { get; set; } = new RedisChannel("Default", RedisChannel.PatternMode.Literal);
#endregion Private Properties
#region Private Methods
private void setupSubscriber()
{
ISubscriber sub = redis.GetSubscriber();
//Subscribe to the channel named messages
sub.Subscribe(_channel, (channel, message) =>
{
Log.Trace($"ch {channel} | {message}");
// messaggio
PubSubEventArgs mea = new PubSubEventArgs($"{message}");
// se qualcuno ascolta sollevo evento nuovo valore...
if (EA_NewMessage != null)
{
EA_NewMessage(this, mea);
}
});
Log.Info($"Subscribed {_channel}");
}
#endregion Private Methods
}
public class PubSubEventArgs : EventArgs
{
#region Public Constructors
public PubSubEventArgs(string messaggio)
{
this.newMessage = messaggio;
}
#endregion Public Constructors
#region Public Properties
public string newMessage { get; set; } = "";
#endregion Public Properties
}
}
+86 -6
View File
@@ -10,40 +10,120 @@ namespace MagMan.Core
{
public class RestPayload
{
public class Materials
#region Public Classes
public class Alias
{
#region Public Properties
/// <summary>
/// Elenco materiali x invio POST
/// Elenco decodifica Alias Materiali x invio POST
/// </summary>
public List<MaterialDTO>? MatList { get; set; }
public List<AliasDTO> AliasList { get; set; } = new List<AliasDTO>();
#endregion Public Properties
}
public class Items
{
#region Public Properties
/// <summary>
/// Elenco Items x invio POST
/// </summary>
public List<ItemDTO>? ItemList { get; set; }
#endregion Public Properties
}
public class LogData
{
#region Public Properties
/// <summary>
/// Elenco record log x invio POST
/// </summary>
public List<LogMachineDTO> LogList { get; set; } = new List<LogMachineDTO>();
#endregion Public Properties
}
public class Materials
{
#region Public Properties
/// <summary>
/// Elenco materiali x invio POST
/// </summary>
public List<MaterialDTO>? MatList { get; set; }
#endregion Public Properties
}
public class PeriodData
{
#region Public Properties
public DateTime DtEnd { get; set; } = DateTime.Now;
public DateTime DtStart { get; set; } = DateTime.Now;
#endregion Public Properties
}
public class ProdInfoData
{
#region Public Properties
public ProjectProgrDTO? ProjectProgress { get; set; }
#endregion Public Properties
}
public class Projects
{
#region Public Properties
public ProjectDTO? Project { get; set; }
#endregion Public Properties
}
public class ProjStatusData
{
#region Public Properties
public Dictionary<int, bool>? ProjStatusList { get; set; }
#endregion Public Properties
}
public class Resources
{
#region Public Properties
/// <summary>
/// ID progetto univoco esterno (da associare a KEY) BB / LOCAL
/// DataOra richiesta (data-ora del client)
/// </summary>
public int ProjLocalId { get; set; } = 0;
public DateTime DtReq { get; set; } = DateTime.Now;
/// <summary>
/// ID progetto univoco su cloud
/// </summary>
public int ProjCloudId { get; set; } = 0;
/// <summary>
/// Tipo di registrazione dato inviata (previsione consumo, consumo effettivo...)
/// </summary>
public ProjResState ReqState { get; set; } = ProjResState.ND;
/// <summary>
/// Elenco Risorse x invio POST
/// </summary>
public List<ResourceDTO>? ResourceList { get; set; }
#endregion Public Properties
}
#endregion Public Classes
}
}
}
@@ -1,8 +1,6 @@
using MagMan.Core;
using Microsoft.Extensions.Configuration;
using NLog;
using NLog.Fluent;
using NLog;
using StackExchange.Redis;
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -10,27 +8,42 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.Services
namespace MagMan.Core.Services
{
/// <summary>
/// Classe di partenza x costruzione servizi di accesso dati + cache
/// </summary>
public class BaseServ
{
#region Public Methods
/// <summary>
/// Refresh globale cache redis
/// </summary>
/// <returns></returns>
public async Task<bool> FlushRedisCache()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
await Task.Delay(1);
RedisValue pattern = new RedisValue($"{Const.rKeyConfig}:*");
bool answ = await ExecFlushRedisPattern(pattern);
stopWatch.Stop();
Log.Debug($"FlushRedisCache in {stopWatch.Elapsed.TotalMilliseconds} ms");
return answ;
}
#endregion Public Methods
#region Protected Fields
protected static IConfiguration _configuration = null!;
protected static Logger Log = LogManager.GetCurrentClassLogger();
protected IConfiguration _configuration = null!;
/// <summary>
/// Durata cache lunga IN SECONDI
/// Numero di operazioni parallele che si possono svolgere... (se 0 NON usa cicli paralleli)
/// </summary>
protected int cacheTtlLong = 60 * 5;
/// <summary>
/// Durata cache breve IN SECONDI
/// </summary>
protected int cacheTtlShort = 60 * 1;
protected int numPar = 0;
/// <summary>
/// Oggetto per connessione a REDIS
@@ -42,12 +55,12 @@ namespace MagMan.Data.Tenant.Services
/// </summary>
protected IDatabase redisDb = null!;
protected Random rnd = new Random();
#endregion Protected Fields
#region Protected Properties
protected string CodApp { get; set; } = "";
/// <summary>
/// Durata cache breve (1 min circa + perturbazione percentuale +/-10%)
/// </summary>
@@ -92,41 +105,69 @@ namespace MagMan.Data.Tenant.Services
protected async Task<bool> ExecFlushRedisPattern(RedisValue pattern)
{
bool answ = false;
var listEndpoints = redisConn.GetEndPoints();
foreach (var endPoint in listEndpoints)
/*******************************
* Recupero elenco dei server da cui cancellare le chaivi:
* - prendo solo i server connessi
* - prendo solo NON repliche (= master)
* - me ne aspetto 1 in uscita cmq
*******************************/
var connServ = redisConn.GetEndPoints()
.Select(endpoint =>
{
var server = redisConn.GetServer(endpoint);
return server;
})
.Where(x => x.IsConnected && !x.IsReplica)
.ToList();
// ciclo (anche se me ne aspetto 1 solo)
foreach (var mServer in connServ)
{
//var server = redisConnAdmin.GetServer(listEndpoints[0]);
var server = redisConn.GetServer(endPoint);
if (server != null)
try
{
var keyList = server.Keys(redisDb.Database, pattern);
foreach (var item in keyList)
var keyList = mServer.Keys(redisDb.Database, pattern);
if (numPar > 0)
{
await redisDb.KeyDeleteAsync(item);
var options = new ParallelOptions { MaxDegreeOfParallelism = numPar };
await Parallel.ForEachAsync(keyList, async (item, token) =>
{
// cancello
await redisDb.KeyDeleteAsync(item);
});
}
else
{
foreach (var item in keyList)
{
await redisDb.KeyDeleteAsync(item);
}
}
answ = true;
}
catch (Exception exc)
{
Log.Error($"Eccezione durante ExecFlushRedisPattern | pattern: {pattern}{Environment.NewLine}{exc}");
}
}
return answ;
}
/// <summary>
/// Refresh globale cache redis
/// </summary>
/// <returns></returns>
protected async Task<bool> FlushRedisCache()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
await Task.Delay(1);
RedisValue pattern = new RedisValue($"{Const.rKeyConfig}:*");
bool answ = await ExecFlushRedisPattern(pattern);
stopWatch.Stop();
Log.Debug($"FlushRedisCache in {stopWatch.Elapsed.TotalMilliseconds} ms");
return answ;
}
#endregion Protected Methods
#region Private Fields
/// <summary>
/// Durata cache lunga IN SECONDI
/// </summary>
private int cacheTtlLong = 60 * 5;
/// <summary>
/// Durata cache breve IN SECONDI
/// </summary>
private int cacheTtlShort = 60 * 1;
private Random rnd = new Random();
#endregion Private Fields
}
}
+134 -39
View File
@@ -1,6 +1,7 @@
using Blazored.LocalStorage;
using Blazored.SessionStorage;
using Microsoft.AspNetCore.Components;
using Microsoft.VisualBasic;
using NLog;
using StackExchange.Redis;
using System.Diagnostics;
@@ -19,45 +20,71 @@ namespace MagMan.Core.Services
// setup componenti REDIS
redisConn = RedConn;
redisDb = redisConn.GetDatabase();
// setup canali pub/sub
QueUpdGen = new MessagePipe(redisConn, Const.Q_MMAN_GEN);
QueUpdAliasMat = new MessagePipe(redisConn, Const.Q_MMAN_ALIAS_MAT);
QueUpdInve= new MessagePipe(redisConn, Const.Q_MMAN_LOG);
QueUpdLog = new MessagePipe(redisConn, Const.Q_MMAN_LOG);
QueUpdProj = new MessagePipe(redisConn, Const.Q_MMAN_PROJ);
QueUpdRes = new MessagePipe(redisConn, Const.Q_MMAN_RES);
}
#endregion Public Constructors
#region Public Events
public event Action EA_FilterUpdated = null!;
public event Action EA_HideSearch = null!;
public event Action EA_PageUpdated = null!;
public event Action EA_SearchUpdated = null!;
public event Action EA_ShowSearch = null!;
public event Action EA_CustomerSel = null!;
public event Action EA_FilterUpdated = null!;
public event Action EA_HideSearch = null!;
public event Action EA_KeySel = null!;
public event Action EA_PageUpdated = null!;
public event Action EA_SearchUpdated = null!;
public event Action<bool> EA_ShowCustomers = null!;
public event Action EA_ShowSearch = null!;
#endregion Public Events
#if false
public SelectData DetailFilter
#region Public Properties
public int CustomerID
{
get => _detailFilter;
get => _customerID;
set
{
if (_detailFilter != value)
if (_customerID != value)
{
_detailFilter = value;
if (EA_FilterUpdated != null)
_customerID = value;
if (EA_CustomerSel != null)
{
EA_FilterUpdated?.Invoke();
EA_CustomerSel?.Invoke();
}
}
}
}
public SelectOrderData Order_Filter { get; set; } = SelectOrderData.Init(5, 30);
#endif
#region Public Properties
public string UserName { get; set; } = "NA";
public int KeyNum
{
get => _keyNum;
set
{
if (_keyNum != value)
{
_keyNum = value;
if (EA_KeySel != null)
{
EA_KeySel?.Invoke();
}
}
}
}
public string PageIcon
{
@@ -100,25 +127,24 @@ namespace MagMan.Core.Services
}
}
}
public int CustomerID
{
get => _customerID;
set
{
if (_customerID != value)
{
_customerID = value;
if (EA_CustomerSel != null)
{
EA_CustomerSel?.Invoke();
}
}
}
}
public string SelOrderCode { get; set; } = "";
public string SelPlantId { get; set; } = "0";
public bool ShowCustomers
{
get => _showCustomers;
set
{
_showCustomers = value;
if (EA_ShowCustomers != null)
{
EA_ShowCustomers?.Invoke(value);
}
}
}
public bool ShowSearch
{
get => _showSearch;
@@ -145,6 +171,42 @@ namespace MagMan.Core.Services
}
}
/// <summary>
/// Message pipe ricezione dati da EgtBW relativi a info Alias/Materials
/// </summary>
public MessagePipe QueUpdAliasMat { get; set; } = null!;
/// <summary>
/// Message pipe ricezione dati da EgtBW (General/Generics)
/// </summary>
public MessagePipe QueUpdGen { get; set; } = null!;
/// <summary>
/// Message pipe ricezione dati da EgtBW relativi a info LogMachine
/// </summary>
public MessagePipe QueUpdLog { get; set; } = null!;
/// <summary>
/// Message pipe ricezione dati da EgtBW relativi a info Projects
/// </summary>
public MessagePipe QueUpdProj { get; set; } = null!;
/// <summary>
/// Message pipe ricezione dati da EgtBW relativi a info Resources
/// </summary>
public MessagePipe QueUpdRes { get; set; } = null!;
/// <summary>
/// Message pipe ricezione dati da EgtBW relativi a info Inventario (aggiunta/consumi)
/// </summary>
public MessagePipe QueUpdInve { get; set; } = null!;
public string UserName { get; set; } = "NA";
#endregion Public Properties
#region Public Methods
/// <summary>
/// Cliente selezionato (da browser data cache)
/// </summary>
@@ -157,14 +219,28 @@ namespace MagMan.Core.Services
/// <summary>
/// Imposta Cliente selezionato (browser data cache)
/// </summary>
public async Task ClientIdSet(int machSel)
public async Task ClientIdSet(int newVal)
{
await localStore.SetItemAsync("ClientID", machSel);
await localStore.SetItemAsync("ClientID", newVal);
}
#endregion Public Properties
/// <summary>
/// Num record x la pagina corrente
/// </summary>
public async Task<int> NumRowGridGet(string gridName)
{
var answ = await localStore.GetItemAsync<int>($"{gridName}_nRow");
answ = answ > 0 ? answ : 10;
return answ;
}
#region Public Methods
/// <summary>
/// Imposta num record x la pagina corrente
/// </summary>
public async Task NumRowGridSet(string gridName, int newVal)
{
await localStore.SetItemAsync($"{gridName}_nRow", newVal);
}
/// <summary>
/// Recupera CustomerID dal dizionario dei token noti o cercando sul DB
@@ -191,6 +267,23 @@ namespace MagMan.Core.Services
return fatto;
}
/// <summary>
/// KeyNum da cliente selezionato (da browser data cache)
/// </summary>
public async Task<int> KeyNumGet()
{
var answ = await localStore.GetItemAsync<int>("KeyNum");
return answ;
}
/// <summary>
/// Imposta KeyNum da cliente selezionato (browser data cache)
/// </summary>
public async Task KeyNumSet(int newVal)
{
await localStore.SetItemAsync("KeyNum", newVal);
}
/// <summary>
/// Recupera CustomerID dal dizionario dei token noti o cercando sul DB
/// </summary>
@@ -499,10 +592,12 @@ namespace MagMan.Core.Services
#region Private Fields
private int _customerID = -1;
private int _keyNum = -1;
private string _pageIcon = "";
private string _pageName = "";
private string _searchVal = "";
private int _customerID = -1;
private bool _showCustomers = true;
private bool _showSearch = false;
private Logger Log = LogManager.GetCurrentClassLogger();
+7 -6
View File
@@ -35,14 +35,15 @@ namespace MagMan.Data.Admin
public static bool CheckCreateUser(string username, string pwd, string dbName)
{
bool answ = false;
int numUser = 0;
using (ServerAdminContext adbCtx = new ServerAdminContext())
{
// ricerca utente...
var numUser = adbCtx
.UserList
.Where(x => x.User == username)
.ToList()
.Count;
numUser = adbCtx
.UserList
.Where(x => x.User == username)
.ToList()
.Count;
if (numUser > 0)
{
answ = true;
@@ -54,7 +55,7 @@ namespace MagMan.Data.Admin
adbCtx.Database.ExecuteSqlRaw(sqlCommand);
sqlCommand = $"CREATE USER '{username}'@'localhost' IDENTIFIED BY '{pwd}';";
adbCtx.Database.ExecuteSqlRaw(sqlCommand);
sqlCommand = $"GRANT ALL ON *.* TO '{username}'@'localhost';";
sqlCommand = $"GRANT ALL PRIVILEGES ON {dbName}.* TO '{username}'@'localhost';";
adbCtx.Database.ExecuteSqlRaw(sqlCommand);
sqlCommand = "FLUSH PRIVILEGES;";
adbCtx.Database.ExecuteSqlRaw(sqlCommand);
+53 -3
View File
@@ -1,4 +1,6 @@
using Microsoft.EntityFrameworkCore;
using MySqlConnector;
using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -47,6 +49,23 @@ namespace MagMan.Data.Admin
return DbAdmin.CheckCreateUser(DATABASE_USER, DATABASE_PWD, DATABASE_NAME);
}
public static ServerVersion CustomAutoDetect(string connectionString)
{
#if false
using var connection = new MySqlConnection(
new MySqlConnectionStringBuilder(connectionString)
{
Database = string.Empty,
// AutoEnlist = false, Pooling = false,
}.ConnectionString);
#endif
using var connection = new MySqlConnection(connectionString);
connection.Open();
ServerVersion currVers = ServerVersion.Parse(connection.ServerVersion);
return currVers;
}
public static bool ExecMigrationIdentity()
{
// esecuzione migrazione
@@ -67,17 +86,48 @@ namespace MagMan.Data.Admin
{
DATABASE_SERV = server;
// tutto fisso x gestione utenti
CONNECTION_STRING = $"Server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None;";
CONNECTION_STRING = $"Server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
// stringa admin con utente admin dell'applicazione (già creato)...
ADMIN_CONNECTION_STRING = $"Server={DATABASE_SERV};port=3306;database=mysql;uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None;";
ADMIN_CONNECTION_STRING = $"Server={DATABASE_SERV};port=3306;database=mysql;uid=egalware;pwd=Egalware_24068!;sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
}
public static ServerVersion MysqlServerVersion(string connString)
{
ServerVersion serverVersion = ServerVersion.AutoDetect(connString);
// fix come da https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/1859
//Log.Info($"MysqlServerVersion | {connString}");
//ServerVersion serverVersion = ServerVersion.Parse("10.11.13-MariaDB");
ServerVersion serverVersion = ServerVersion.Parse("10.5.25-mysql");
bool versOk = false;
try
{
serverVersion = ServerVersion.AutoDetect(connString);
versOk = true;
}
catch (Exception exc)
{
Log.Error($"Eccezione in verifica versione server ServerVersion.AutoDetect: {Environment.NewLine}{exc}");
}
if (!versOk)
{
try
{
serverVersion = CustomAutoDetect(connString);
versOk = true;
}
catch (Exception exc)
{
Log.Error($"Eccezione in verifica versione server CustomAutoDetect: {Environment.NewLine}{exc}");
}
}
return serverVersion;
}
#endregion Public Methods
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
}
}
+1
View File
@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+4 -1
View File
@@ -36,7 +36,7 @@ namespace MagMan.Data.Admin
string connString = DbConfig.CONNECTION_STRING;
if (!optionsBuilder.IsConfigured)
{
var serverVersion = ServerVersion.AutoDetect(connString);
var serverVersion = DbConfig.MysqlServerVersion(connString);
optionsBuilder.UseMySql(connString, serverVersion);
}
}
@@ -47,6 +47,9 @@ namespace MagMan.Data.Admin
// Gestione in blocco user/permessi di base (salvata con migrazione AddUserAndRoles) come in GWMS + https://stackoverflow.com/questions/34343599/how-to-seed-users-and-roles-with-code-first-migration-using-identity-asp-net-cor
// disattivo riferimento view x avere oggetto davvero fittizio
builder.Entity<TableCount>().ToView(null);
builder.Seed();
base.OnModelCreating(builder);
+10 -9
View File
@@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>
@@ -18,22 +19,22 @@
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.28" />
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="6.0.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.28">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.28">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
</ItemGroup>
</Project>
@@ -0,0 +1,391 @@
// <auto-generated />
using System;
using MagMan.Data.Admin;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Admin.Migrations.UserIdentityDb
{
[DbContext(typeof(IdentityContext))]
[Migration("20240412061834_RemoveDbSetCounts")]
partial class RemoveDbSetCounts
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("varchar(255)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("longtext");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
b.HasData(
new
{
Id = "e8456657-70cc-4d00-89e5-d7a8336451d5",
ConcurrencyStamp = "04a20b6f-64ae-40d7-81d8-4a52722193ec",
Name = "Undef",
NormalizedName = "UNDEF"
},
new
{
Id = "dcc6b28b-b0cb-4eb3-a8ce-2dd24ab95037",
ConcurrencyStamp = "5f90e86b-f714-4f88-a975-636d43863e08",
Name = "User",
NormalizedName = "USER"
},
new
{
Id = "487f1bcc-1278-479a-a8bf-ca31e36be138",
ConcurrencyStamp = "36019e5f-e9ee-4451-bf13-c4f563e5bb99",
Name = "Admin",
NormalizedName = "ADMIN"
},
new
{
Id = "c2a01f68-6720-48e9-87c2-433aa44d230e",
ConcurrencyStamp = "cbb91441-0a5b-4d7a-88f7-739b5339365c",
Name = "SuperAdmin",
NormalizedName = "SUPERADMIN"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClaimType")
.HasColumnType("longtext");
b.Property<string>("ClaimValue")
.HasColumnType("longtext");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
{
b.Property<string>("Id")
.HasColumnType("varchar(255)");
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("longtext");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("tinyint(1)");
b.Property<bool>("LockoutEnabled")
.HasColumnType("tinyint(1)");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetime(6)");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("PasswordHash")
.HasColumnType("longtext");
b.Property<string>("PhoneNumber")
.HasColumnType("longtext");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("tinyint(1)");
b.Property<string>("SecurityStamp")
.HasColumnType("longtext");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("tinyint(1)");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
b.HasData(
new
{
Id = "655b49ee-4e4f-467e-b5b1-927d8cf4fd36",
AccessFailedCount = 0,
ConcurrencyStamp = "25f371d7-c9fc-4b7a-bedc-fc02fb9402b0",
Email = "samuele.locatelli@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "SAMUELE.LOCATELLI@EGALWARE.COM",
NormalizedUserName = "SAMUELE.LOCATELLI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEFTIbK5uhgIKXFvdYGv8QhefFh4kG9sHX1EPcpPrCmqf2xpfwm6qaUCHSKxvR8EfLw==",
PhoneNumberConfirmed = false,
SecurityStamp = "8200bcdd-2b13-4cd3-a81c-3c5598d6b5f6",
TwoFactorEnabled = false,
UserName = "samuele.locatelli@egalware.com"
},
new
{
Id = "75122e30-0933-4538-aee5-a4193b60fc91",
AccessFailedCount = 0,
ConcurrencyStamp = "1be7030f-bb4d-41ae-ae10-0fb3e8e11804",
Email = "emmanuele.sassi@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "EMMANUELE.SASSI@EGALWARE.COM",
NormalizedUserName = "EMMANUELE.SASSI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEANSSGEvLhSbYhJevBDO/Aoq0brwvn1KU5Sv/PJdNCE0+9ZyzGXXyQ+qTJR9gzWS1w==",
PhoneNumberConfirmed = false,
SecurityStamp = "62ed1518-5c7a-4d22-85e9-8bdd54a086ff",
TwoFactorEnabled = false,
UserName = "emmanuele.sassi@egalware.com"
},
new
{
Id = "5d532138-4470-466c-9d89-0c968e6bde1e",
AccessFailedCount = 0,
ConcurrencyStamp = "bf75f82a-4fc5-4bfd-8244-9e03f606387b",
Email = "luca.mazzoleni@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "LUCA.MAZZOLENI@EGALWARE.COM",
NormalizedUserName = "LUCA.MAZZOLENI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEMXSnNBKQhXsCw+CDzgYLKnYk6hsS/sHzOu0kk9C7buY/B9lIQf8dH7F8AXnOp25mA==",
PhoneNumberConfirmed = false,
SecurityStamp = "c974de3d-d0d5-45c4-b685-02b935ada41c",
TwoFactorEnabled = false,
UserName = "luca.mazzoleni@egalware.com"
},
new
{
Id = "ed350b67-b800-4800-9d4e-f2726d836eb5",
AccessFailedCount = 0,
ConcurrencyStamp = "bd182360-ce6a-400a-b295-f42bb5e5abf2",
Email = "info@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "INFO@EGALWARE.COM",
NormalizedUserName = "INFO@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEEqp3H7Tbc/HpqkAJuuZH85PLTWxx0x1vrZI9qpDRLSbSowBKlQqmrc1whRPledpbg==",
PhoneNumberConfirmed = false,
SecurityStamp = "7aa1ab48-a654-42ec-b7ba-8f34d90edde7",
TwoFactorEnabled = false,
UserName = "info@egalware.com"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClaimType")
.HasColumnType("longtext");
b.Property<string>("ClaimValue")
.HasColumnType("longtext");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderDisplayName")
.HasColumnType("longtext");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("varchar(255)");
b.Property<string>("RoleId")
.HasColumnType("varchar(255)");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
b.HasData(
new
{
UserId = "655b49ee-4e4f-467e-b5b1-927d8cf4fd36",
RoleId = "c2a01f68-6720-48e9-87c2-433aa44d230e"
},
new
{
UserId = "75122e30-0933-4538-aee5-a4193b60fc91",
RoleId = "c2a01f68-6720-48e9-87c2-433aa44d230e"
},
new
{
UserId = "5d532138-4470-466c-9d89-0c968e6bde1e",
RoleId = "dcc6b28b-b0cb-4eb3-a8ce-2dd24ab95037"
},
new
{
UserId = "ed350b67-b800-4800-9d4e-f2726d836eb5",
RoleId = "dcc6b28b-b0cb-4eb3-a8ce-2dd24ab95037"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("varchar(255)");
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Name")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Value")
.HasColumnType("longtext");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,34 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Admin.Migrations.UserIdentityDb
{
public partial class RemoveDbSetCounts : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "DbSetCounts");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "DbSetCounts",
columns: table => new
{
Count = table.Column<int>(type: "int", nullable: false),
TableName = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
})
.Annotation("MySql:CharSet", "utf8mb4");
}
}
}
@@ -0,0 +1,398 @@
// <auto-generated />
using System;
using MagMan.Data.Admin;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Admin.Migrations.UserIdentityDb
{
[DbContext(typeof(IdentityContext))]
[Migration("20240705134830_AddSuperUser")]
partial class AddSuperUser
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.28")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("varchar(255)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("longtext");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
b.HasData(
new
{
Id = "61898d91-a58c-4fcb-8da2-5078e32bb1eb",
ConcurrencyStamp = "f280c659-3676-4661-b66d-dcb5c6963fd1",
Name = "Undef",
NormalizedName = "UNDEF"
},
new
{
Id = "ef658f55-424b-4a45-a8bc-a2a6297e9e10",
ConcurrencyStamp = "9d095d39-178a-4471-a037-a13b3ab4f101",
Name = "User",
NormalizedName = "USER"
},
new
{
Id = "aa2e0987-62fd-4048-9deb-6e3c7f671865",
ConcurrencyStamp = "2609bd9d-b405-4a8c-bfa7-2bcab3ad38aa",
Name = "SuperUser",
NormalizedName = "SUPERUSER"
},
new
{
Id = "e63dae22-57dc-4dc6-bef5-be0928d98dd3",
ConcurrencyStamp = "3975cad2-c02b-4c93-86e2-86b29f596dd3",
Name = "Admin",
NormalizedName = "ADMIN"
},
new
{
Id = "9be32f20-0eee-4fac-97ab-00485b01b9d9",
ConcurrencyStamp = "2a080580-37cd-4b9e-8a99-ce9d99fe3b4f",
Name = "SuperAdmin",
NormalizedName = "SUPERADMIN"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClaimType")
.HasColumnType("longtext");
b.Property<string>("ClaimValue")
.HasColumnType("longtext");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUser", b =>
{
b.Property<string>("Id")
.HasColumnType("varchar(255)");
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("longtext");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("tinyint(1)");
b.Property<bool>("LockoutEnabled")
.HasColumnType("tinyint(1)");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetime(6)");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.Property<string>("PasswordHash")
.HasColumnType("longtext");
b.Property<string>("PhoneNumber")
.HasColumnType("longtext");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("tinyint(1)");
b.Property<string>("SecurityStamp")
.HasColumnType("longtext");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("tinyint(1)");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("varchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
b.HasData(
new
{
Id = "0a01453d-17db-4c3a-87dd-33ce18974aac",
AccessFailedCount = 0,
ConcurrencyStamp = "775cec82-a98f-4575-bb6c-743b6c1fc79e",
Email = "samuele.locatelli@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "SAMUELE.LOCATELLI@EGALWARE.COM",
NormalizedUserName = "SAMUELE.LOCATELLI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEBLzPhI6ILF8fuQrEgkH8+rFWDFWviVTf+DnWoDutRb5LOt5LnuDmya/Wbmh/5FoBw==",
PhoneNumberConfirmed = false,
SecurityStamp = "7108c3f4-99b2-4901-b056-aba4a0cdb304",
TwoFactorEnabled = false,
UserName = "samuele.locatelli@egalware.com"
},
new
{
Id = "bba018ae-56c2-43d6-babd-50616c1fe826",
AccessFailedCount = 0,
ConcurrencyStamp = "f96737d1-b63d-4e98-a55d-b3205971df78",
Email = "emmanuele.sassi@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "EMMANUELE.SASSI@EGALWARE.COM",
NormalizedUserName = "EMMANUELE.SASSI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEOBoFtuiYZGMpUltyIepbFz9bI9LLoAEo8fnjPVsnShl73RHlLZNJjBG+Oh2GgGxFg==",
PhoneNumberConfirmed = false,
SecurityStamp = "74bc6030-02e8-4237-aac4-d0062277dfc8",
TwoFactorEnabled = false,
UserName = "emmanuele.sassi@egalware.com"
},
new
{
Id = "be99d5c7-f8c3-4429-b6de-ecb2032b0658",
AccessFailedCount = 0,
ConcurrencyStamp = "f7babbe0-0ab9-4428-bbb4-0cac6f4ee404",
Email = "luca.mazzoleni@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "LUCA.MAZZOLENI@EGALWARE.COM",
NormalizedUserName = "LUCA.MAZZOLENI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAENL3XhLx/+KxlDD3wJPCnj/BTJTNTP0hIuspu2Xlj/TLxDZ1yz6im0V9eqUwzjhJyw==",
PhoneNumberConfirmed = false,
SecurityStamp = "f7779584-e160-4c37-ba19-4d2702412da5",
TwoFactorEnabled = false,
UserName = "luca.mazzoleni@egalware.com"
},
new
{
Id = "aca6c684-1cb3-4cc8-ab59-ce27d6879a8c",
AccessFailedCount = 0,
ConcurrencyStamp = "e2eca078-1adf-45a2-ba6a-c39497107845",
Email = "info@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "INFO@EGALWARE.COM",
NormalizedUserName = "INFO@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAELj8C6+r2T6zDvEFiDcDkW78l0oeO8aE51Y3WFeEiXUeCoPO2WjBY3MW1VRwpmF8aQ==",
PhoneNumberConfirmed = false,
SecurityStamp = "7e1ff0bc-c55c-413f-9721-56ce3aa6c687",
TwoFactorEnabled = false,
UserName = "info@egalware.com"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClaimType")
.HasColumnType("longtext");
b.Property<string>("ClaimValue")
.HasColumnType("longtext");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderKey")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("ProviderDisplayName")
.HasColumnType("longtext");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("varchar(255)");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("varchar(255)");
b.Property<string>("RoleId")
.HasColumnType("varchar(255)");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
b.HasData(
new
{
UserId = "0a01453d-17db-4c3a-87dd-33ce18974aac",
RoleId = "9be32f20-0eee-4fac-97ab-00485b01b9d9"
},
new
{
UserId = "bba018ae-56c2-43d6-babd-50616c1fe826",
RoleId = "9be32f20-0eee-4fac-97ab-00485b01b9d9"
},
new
{
UserId = "be99d5c7-f8c3-4429-b6de-ecb2032b0658",
RoleId = "ef658f55-424b-4a45-a8bc-a2a6297e9e10"
},
new
{
UserId = "aca6c684-1cb3-4cc8-ab59-ce27d6879a8c",
RoleId = "ef658f55-424b-4a45-a8bc-a2a6297e9e10"
});
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("varchar(255)");
b.Property<string>("LoginProvider")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Name")
.HasMaxLength(128)
.HasColumnType("varchar(128)");
b.Property<string>("Value")
.HasColumnType("longtext");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,31 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Admin.Migrations.UserIdentityDb
{
public partial class AddSuperUser : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.InsertData(
table: "AspNetRoles",
columns: new[] { "Id", "ConcurrencyStamp", "Name", "NormalizedName" },
values: new object[,]
{
{ "aa2e0987-62fd-4048-9deb-6e3c7f671865", "2609bd9d-b405-4a8c-bfa7-2bcab3ad38aa", "SuperUser", "SUPERUSER" }
});
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DeleteData(
table: "AspNetRoles",
keyColumn: "Id",
keyValue: "aa2e0987-62fd-4048-9deb-6e3c7f671865");
}
}
}
@@ -16,21 +16,9 @@ namespace MagMan.Data.Admin.Migrations.UserIdentityDb
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("ProductVersion", "6.0.28")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Admin.DbModels.TableCount", b =>
{
b.Property<int>("Count")
.HasColumnType("int");
b.Property<string>("TableName")
.IsRequired()
.HasColumnType("longtext");
b.ToTable("DbSetCounts");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
@@ -59,29 +47,36 @@ namespace MagMan.Data.Admin.Migrations.UserIdentityDb
b.HasData(
new
{
Id = "82b54f2b-4da8-4e46-83bf-57ffc17cf8ed",
ConcurrencyStamp = "763dedf1-0868-424e-bc0a-1572a548c1d7",
Id = "61898d91-a58c-4fcb-8da2-5078e32bb1eb",
ConcurrencyStamp = "f280c659-3676-4661-b66d-dcb5c6963fd1",
Name = "Undef",
NormalizedName = "UNDEF"
},
new
{
Id = "34ae910e-acaf-46d1-aaa8-279a74c5bc61",
ConcurrencyStamp = "8b90b548-3d22-40c6-95ba-c3fb0ea032a7",
Id = "ef658f55-424b-4a45-a8bc-a2a6297e9e10",
ConcurrencyStamp = "9d095d39-178a-4471-a037-a13b3ab4f101",
Name = "User",
NormalizedName = "USER"
},
new
{
Id = "8352aca0-c5e8-4a2d-be76-f6cde5f963a1",
ConcurrencyStamp = "63d84be1-17ac-4e8c-9bd7-35e0ed056533",
Id = "aa2e0987-62fd-4048-9deb-6e3c7f671865",
ConcurrencyStamp = "2609bd9d-b405-4a8c-bfa7-2bcab3ad38aa",
Name = "SuperUser",
NormalizedName = "SUPERUSER"
},
new
{
Id = "e63dae22-57dc-4dc6-bef5-be0928d98dd3",
ConcurrencyStamp = "3975cad2-c02b-4c93-86e2-86b29f596dd3",
Name = "Admin",
NormalizedName = "ADMIN"
},
new
{
Id = "285df363-706d-498e-b1ad-4680e141ad01",
ConcurrencyStamp = "365f0dc5-81c1-4deb-945b-58dd8fc9d18a",
Id = "9be32f20-0eee-4fac-97ab-00485b01b9d9",
ConcurrencyStamp = "2a080580-37cd-4b9e-8a99-ce9d99fe3b4f",
Name = "SuperAdmin",
NormalizedName = "SUPERADMIN"
});
@@ -176,65 +171,65 @@ namespace MagMan.Data.Admin.Migrations.UserIdentityDb
b.HasData(
new
{
Id = "3fac0523-697f-4b42-ac39-82026839ba2c",
Id = "0a01453d-17db-4c3a-87dd-33ce18974aac",
AccessFailedCount = 0,
ConcurrencyStamp = "b23608ab-d50a-464d-8db2-8274f088b0ad",
ConcurrencyStamp = "775cec82-a98f-4575-bb6c-743b6c1fc79e",
Email = "samuele.locatelli@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "SAMUELE.LOCATELLI@EGALWARE.COM",
NormalizedUserName = "SAMUELE.LOCATELLI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEAQsxwpx5DzxcFhzIhUciCtBEHZo/GLlB4HtG49I3gTh/WtXSg9VVl0e5KBmopG9VQ==",
PasswordHash = "AQAAAAEAACcQAAAAEBLzPhI6ILF8fuQrEgkH8+rFWDFWviVTf+DnWoDutRb5LOt5LnuDmya/Wbmh/5FoBw==",
PhoneNumberConfirmed = false,
SecurityStamp = "8f4ecdd7-9078-4345-82bc-7c1570e71387",
SecurityStamp = "7108c3f4-99b2-4901-b056-aba4a0cdb304",
TwoFactorEnabled = false,
UserName = "samuele.locatelli@egalware.com"
},
new
{
Id = "238a34e8-7a80-4307-bfcc-41bdc4a39c1f",
Id = "bba018ae-56c2-43d6-babd-50616c1fe826",
AccessFailedCount = 0,
ConcurrencyStamp = "f62ab486-c4e0-450a-8fb4-6905d2e3da64",
ConcurrencyStamp = "f96737d1-b63d-4e98-a55d-b3205971df78",
Email = "emmanuele.sassi@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "EMMANUELE.SASSI@EGALWARE.COM",
NormalizedUserName = "EMMANUELE.SASSI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAECZ2BzJe3VOrXIgdmjBrD+JP/HqsV/eFwMO4DaGzAmFPvHG+xxkRFbwRkI2sYoWt8Q==",
PasswordHash = "AQAAAAEAACcQAAAAEOBoFtuiYZGMpUltyIepbFz9bI9LLoAEo8fnjPVsnShl73RHlLZNJjBG+Oh2GgGxFg==",
PhoneNumberConfirmed = false,
SecurityStamp = "1be739d4-3aed-4a9a-a5c0-80c45a1474a6",
SecurityStamp = "74bc6030-02e8-4237-aac4-d0062277dfc8",
TwoFactorEnabled = false,
UserName = "emmanuele.sassi@egalware.com"
},
new
{
Id = "be261afb-580a-4cb6-a040-c4a335f9ff3a",
Id = "be99d5c7-f8c3-4429-b6de-ecb2032b0658",
AccessFailedCount = 0,
ConcurrencyStamp = "9c306ce8-ec94-49b9-ad24-87b3d9937188",
ConcurrencyStamp = "f7babbe0-0ab9-4428-bbb4-0cac6f4ee404",
Email = "luca.mazzoleni@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "LUCA.MAZZOLENI@EGALWARE.COM",
NormalizedUserName = "LUCA.MAZZOLENI@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEHdDRZVkzBW4qlCF+vvpURb/4bj/b2/kl4+HSEjhbHRAekqX5WMnfJfWMPuyjKrgUg==",
PasswordHash = "AQAAAAEAACcQAAAAENL3XhLx/+KxlDD3wJPCnj/BTJTNTP0hIuspu2Xlj/TLxDZ1yz6im0V9eqUwzjhJyw==",
PhoneNumberConfirmed = false,
SecurityStamp = "121bb662-adf9-4cba-bbc8-12bf1d2bc693",
SecurityStamp = "f7779584-e160-4c37-ba19-4d2702412da5",
TwoFactorEnabled = false,
UserName = "luca.mazzoleni@egalware.com"
},
new
{
Id = "3282b9f4-5240-4946-a8d0-5570df880642",
Id = "aca6c684-1cb3-4cc8-ab59-ce27d6879a8c",
AccessFailedCount = 0,
ConcurrencyStamp = "20720e13-89b3-4660-8c6e-1f11e1e730b4",
ConcurrencyStamp = "e2eca078-1adf-45a2-ba6a-c39497107845",
Email = "info@egalware.com",
EmailConfirmed = true,
LockoutEnabled = false,
NormalizedEmail = "INFO@EGALWARE.COM",
NormalizedUserName = "INFO@EGALWARE.COM",
PasswordHash = "AQAAAAEAACcQAAAAEDEuPnbPPl/9vc6xg/mvOmyEfvirN5ZNDWu21im+PjvtNQcqvqfc9k3KQxtJKBs5EQ==",
PasswordHash = "AQAAAAEAACcQAAAAELj8C6+r2T6zDvEFiDcDkW78l0oeO8aE51Y3WFeEiXUeCoPO2WjBY3MW1VRwpmF8aQ==",
PhoneNumberConfirmed = false,
SecurityStamp = "3bd9e353-ab86-47b2-85da-d857e618f44e",
SecurityStamp = "7e1ff0bc-c55c-413f-9721-56ce3aa6c687",
TwoFactorEnabled = false,
UserName = "info@egalware.com"
});
@@ -304,58 +299,23 @@ namespace MagMan.Data.Admin.Migrations.UserIdentityDb
b.HasData(
new
{
UserId = "3fac0523-697f-4b42-ac39-82026839ba2c",
RoleId = "34ae910e-acaf-46d1-aaa8-279a74c5bc61"
UserId = "0a01453d-17db-4c3a-87dd-33ce18974aac",
RoleId = "9be32f20-0eee-4fac-97ab-00485b01b9d9"
},
new
{
UserId = "3fac0523-697f-4b42-ac39-82026839ba2c",
RoleId = "8352aca0-c5e8-4a2d-be76-f6cde5f963a1"
UserId = "bba018ae-56c2-43d6-babd-50616c1fe826",
RoleId = "9be32f20-0eee-4fac-97ab-00485b01b9d9"
},
new
{
UserId = "3fac0523-697f-4b42-ac39-82026839ba2c",
RoleId = "285df363-706d-498e-b1ad-4680e141ad01"
UserId = "be99d5c7-f8c3-4429-b6de-ecb2032b0658",
RoleId = "ef658f55-424b-4a45-a8bc-a2a6297e9e10"
},
new
{
UserId = "238a34e8-7a80-4307-bfcc-41bdc4a39c1f",
RoleId = "34ae910e-acaf-46d1-aaa8-279a74c5bc61"
},
new
{
UserId = "238a34e8-7a80-4307-bfcc-41bdc4a39c1f",
RoleId = "8352aca0-c5e8-4a2d-be76-f6cde5f963a1"
},
new
{
UserId = "238a34e8-7a80-4307-bfcc-41bdc4a39c1f",
RoleId = "285df363-706d-498e-b1ad-4680e141ad01"
},
new
{
UserId = "be261afb-580a-4cb6-a040-c4a335f9ff3a",
RoleId = "34ae910e-acaf-46d1-aaa8-279a74c5bc61"
},
new
{
UserId = "be261afb-580a-4cb6-a040-c4a335f9ff3a",
RoleId = "8352aca0-c5e8-4a2d-be76-f6cde5f963a1"
},
new
{
UserId = "be261afb-580a-4cb6-a040-c4a335f9ff3a",
RoleId = "285df363-706d-498e-b1ad-4680e141ad01"
},
new
{
UserId = "3282b9f4-5240-4946-a8d0-5570df880642",
RoleId = "34ae910e-acaf-46d1-aaa8-279a74c5bc61"
},
new
{
UserId = "3282b9f4-5240-4946-a8d0-5570df880642",
RoleId = "8352aca0-c5e8-4a2d-be76-f6cde5f963a1"
UserId = "aca6c684-1cb3-4cc8-ab59-ce27d6879a8c",
RoleId = "ef658f55-424b-4a45-a8bc-a2a6297e9e10"
});
});
+3 -15
View File
@@ -24,6 +24,7 @@ namespace MagMan.Data.Admin
{
new IdentityRole { Name = "Undef", NormalizedName = "UNDEF" },
new IdentityRole { Name = "User", NormalizedName = "USER" },
new IdentityRole { Name = "SuperUser", NormalizedName = "SUPERUSER" },
new IdentityRole { Name = "Admin", NormalizedName = "ADMIN" },
new IdentityRole { Name = "SuperAdmin", NormalizedName = "SUPERADMIN" }
};
@@ -45,22 +46,9 @@ namespace MagMan.Data.Admin
for (int i = 0; i < users.Count; i++)
{
#if false
// aggiungo ruoli User ed Admin x tutti
userRoles.Add(new IdentityUserRole<string>
{
UserId = users[i].Id,
RoleId = roles.First(q => q.Name == "User").Id
});
userRoles.Add(new IdentityUserRole<string>
{
UserId = users[i].Id,
RoleId = roles.First(q => q.Name == "Admin").Id
});
#endif
// se nei primi 3 aggiungo anche SuperAdmin
if (i < 3)
// nei primi 3 rendo SuperAdmin
if (i < 2)
{
userRoles.Add(new IdentityUserRole<string>
{
+7 -4
View File
@@ -48,10 +48,13 @@ namespace MagMan.Data.Admin
string connString = DbConfig.CONNECTION_STRING;
if (!optionsBuilder.IsConfigured)
{
#if DEBUG
connString = "Server=localhost;port=3306;database=MagMan_Admin;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
#endif
var serverVersion = ServerVersion.AutoDetect(connString);
// commentato x test su cluster in ufficio
#if DEBUG
//connString = "Server=localhost;port=3306;database=MagMan_Admin;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
//connString = "Server=mdb03.ufficio;port=3306;database=MagMan_Admin;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
connString = "Server=mdb.ufficio;port=3306;database=MagMan_Admin;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
#endif
var serverVersion = DbConfig.MysqlServerVersion(connString);
optionsBuilder.UseMySql(connString, serverVersion);
}
}
+38 -4
View File
@@ -1,6 +1,8 @@
using MagMan.Data.Admin.DbModels;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using MySqlConnector;
using NLog;
namespace MagMan.Data.Admin
@@ -16,18 +18,22 @@ namespace MagMan.Data.Admin
#endregion Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
#region Public Constructors
public ServerAdminContext()
{
Log.Info("Calling ServerAdminContext()");
}
public ServerAdminContext(IConfiguration configuration)
{
Log.Info("Calling ServerAdminContext(IConfiguration configuration)");
}
public ServerAdminContext(DbContextOptions<ServerAdminContext> options) : base(options)
{
Log.Info("Calling ServerAdminContext(DbContextOptions<ServerAdminContext> options)");
}
#endregion Public Constructors
@@ -49,14 +55,42 @@ namespace MagMan.Data.Admin
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
string connString = "";
Log.Info("Calling OnConfiguring");
string connString = DbConfig.ADMIN_CONNECTION_STRING;
if (!optionsBuilder.IsConfigured)
{
// chiave cablata x gestione Server
connString = "Server=localhost;port=3306;database=mysql;user=root;pwd=Egalware_24068!;sslmode=None;";
var serverVersion = ServerVersion.AutoDetect(connString);
// chiave cablata x gestione Server se fosse vuota...
if (string.IsNullOrEmpty(connString))
{
connString = "Server=localhost;port=3306;database=mysql;user=egalware;pwd=Egalware_24068!;sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;";
}
ServerVersion serverVersion = DbConfig.MysqlServerVersion(connString);
optionsBuilder.UseMySql(connString, serverVersion);
Log.Info("NOT Configured | connString forced to default!");
}
else
{
Log.Info("optionsBuilder.IsConfigured");
}
}
public static ServerVersion CustomAutoDetect(string connectionString)
{
#if false
using var connection = new MySqlConnection(
new MySqlConnectionStringBuilder(connectionString)
{
Database = string.Empty,
// AutoEnlist = false,
// Pooling = false,
}.ConnectionString);
#endif
using var connection = new MySqlConnection(connectionString);
connection.Open();
ServerVersion currVers = ServerVersion.Parse(connection.ServerVersion);
return currVers;
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
-70
View File
@@ -1,70 +0,0 @@
using Microsoft.Extensions.Configuration;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Admin.Services
{
/// <summary>
/// Classe di partenza x costruzione servizi di accesso dati + cache
/// </summary>
public class BaseServ
{
#region Protected Properties
/// <summary>
/// Durata cache breve (1 min circa + perturbazione percentuale +/-10%)
/// </summary>
protected TimeSpan FastCache
{
get => TimeSpan.FromSeconds(cacheTtlShort * rnd.Next(900, 1100) / 1000);
}
/// <summary>
/// Durata cache lunga (+ perturbazione percentuale +/-10%)
/// </summary>
protected TimeSpan LongCache
{
get => TimeSpan.FromSeconds(cacheTtlLong * rnd.Next(900, 1100) / 1000);
}
/// <summary>
/// Durata cache MOLTO breve (10 sec circa + perturbazione percentuale +/-10%)
/// </summary>
protected TimeSpan UltraFastCache
{
get => TimeSpan.FromSeconds(cacheTtlShort / 6 * rnd.Next(900, 1100) / 1000);
}
/// <summary>
/// Durata cache MOLTO lunga (+ perturbazione percentuale +/-10%)
/// </summary>
protected TimeSpan UltraLongCache
{
get => TimeSpan.FromSeconds(cacheTtlLong * 10 * rnd.Next(900, 1100) / 1000);
}
#endregion Protected Properties
protected static IConfiguration _configuration = null!;
#region Private Fields
/// <summary>
/// Durata cache lunga IN SECONDI
/// </summary>
private int cacheTtlLong = 60 * 5;
/// <summary>
/// Durata cache breve IN SECONDI
/// </summary>
private int cacheTtlShort = 60 * 1;
private Random rnd = new Random();
#endregion Private Fields
}
}
+12 -82
View File
@@ -4,17 +4,14 @@ using MagMan.Data.Admin.Controllers;
using MagMan.Data.Admin.DbModels;
using Microsoft.AspNetCore.Identity;
using Microsoft.AspNetCore.Identity.UI.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.VisualBasic;
using Newtonsoft.Json;
using NLog;
using StackExchange.Redis;
using System.Diagnostics;
namespace MagMan.Data.Admin.Services
{
public class MTAdminService : BaseServ
public class MTAdminService : BaseServ, IDisposable
{
#region Public Constructors
@@ -24,6 +21,7 @@ namespace MagMan.Data.Admin.Services
_configuration = configuration;
_emailSender = emailSender;
_userManager = userManager;
// Conf cache
redisConn = redisConnMult;
redisDb = this.redisConn.GetDatabase();
@@ -35,22 +33,20 @@ namespace MagMan.Data.Admin.Services
};
// cod app
CodApp = _configuration["CodApp"];
CodApp = _configuration.GetValue<string>("OptConf:CodApp");
// gestione parallelismo...
numPar = _configuration.GetValue<int>("OptConf:NumPar");
// DB
dbController = new MTAdminController(configuration);
// chiudo log
Log.Info("MTAdminService started!");
_userManager = userManager;
}
#endregion Public Constructors
#region Public Properties
public string CodApp { get; set; } = "";
#endregion Public Properties
#region Public Methods
/// <summary>
@@ -68,7 +64,7 @@ namespace MagMan.Data.Admin.Services
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty(rawData))
if (!string.IsNullOrEmpty(rawData) && rawData.Length > 2)
{
source = "REDIS";
var tempResult = JsonConvert.DeserializeObject<List<AuthKeyModel>>(rawData);
@@ -285,20 +281,9 @@ namespace MagMan.Data.Admin.Services
return fatto;
}
/// <summary>
/// Refresh globale cache redis
/// </summary>
/// <returns></returns>
public async Task<bool> FlushRedisCache()
public void Dispose()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
await Task.Delay(1);
RedisValue pattern = new RedisValue($"{Const.rKeyConfig}:*");
bool answ = await ExecFlushRedisPattern(pattern);
stopWatch.Stop();
Log.Debug($"FlushRedisCache in {stopWatch.Elapsed.TotalMilliseconds} ms");
return answ;
dbController.Dispose();
}
/// <summary>
@@ -481,7 +466,6 @@ namespace MagMan.Data.Admin.Services
await ExecFlushRedisPattern((RedisValue)currKey);
}
private readonly UserManager<IdentityUser> _userManager;
public async Task<List<UserData>> UserDataGetFilt(string searchVal)
{
// Collezione utenti
@@ -573,67 +557,13 @@ namespace MagMan.Data.Admin.Services
#region Private Fields
private static JsonSerializerSettings? JSSettings;
private static Logger Log = LogManager.GetCurrentClassLogger();
private readonly IEmailSender _emailSender;
/// <summary>
/// Durata cache lunga IN SECONDI
/// </summary>
private int cacheTtlLong = 60 * 5;
/// <summary>
/// Durata cache breve IN SECONDI
/// </summary>
private int cacheTtlShort = 60 * 1;
/// <summary>
/// Oggetto per connessione a REDIS
/// </summary>
private IConnectionMultiplexer redisConn;
/// <summary>
/// Oggetto DB redis da impiegare x chiamate R/W
/// </summary>
private IDatabase redisDb = null!;
/// <summary>
/// Generatore random
/// </summary>
private Random rnd = new Random();
private readonly UserManager<IdentityUser> _userManager;
#endregion Private Fields
#region Private Methods
/// <summary>
/// Esegue flush memoria redis dato pattern
/// </summary>
/// <param name="pattern"></param>
/// <returns></returns>
private async Task<bool> ExecFlushRedisPattern(RedisValue pattern)
{
bool answ = false;
var listEndpoints = redisConn.GetEndPoints();
foreach (var endPoint in listEndpoints)
{
//var server = redisConnAdmin.GetServer(listEndpoints[0]);
var server = redisConn.GetServer(endPoint);
if (server != null)
{
var keyList = server.Keys(redisDb.Database, pattern);
foreach (var item in keyList)
{
await redisDb.KeyDeleteAsync(item);
}
answ = true;
}
}
return answ;
}
/// <summary>
/// Recupera UN SINGOLO VALORE dalla hash per un dato field
/// </summary>
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -24,10 +24,10 @@ namespace MagMan.Data.Tenant
#region Public Methods
public static async Task<bool> migrateDbMain()
public static async Task<bool> migrateDbMain(string connString)
{
bool answ = false;
using (MagManContext dbCtx = new MagManContext())
using (MagManContext dbCtx = new MagManContext(connString))
{
await dbCtx.Database.MigrateAsync();
answ = true;
+61 -4
View File
@@ -1,4 +1,6 @@
using Microsoft.EntityFrameworkCore;
using MySqlConnector;
using NLog;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -30,16 +32,33 @@ namespace MagMan.Data.Tenant
#region Public Methods
public static ServerVersion CustomAutoDetect(string connectionString)
{
#if false
using var connection = new MySqlConnection(
new MySqlConnectionStringBuilder(connectionString)
{
Database = string.Empty,
// AutoEnlist = false, Pooling = false,
}.ConnectionString);
#endif
using var connection = new MySqlConnection(connectionString);
connection.Open();
ServerVersion currVers = ServerVersion.Parse(connection.ServerVersion);
return currVers;
}
public static string CustomerConnString(string server, int nKey)
{
string dbName = $"MagMan_{nKey:000000}";
return $"server={server};port=3306;database={dbName};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
return $"server={server};port=3306;database={dbName};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
//LoadBalance=RoundRobin;Pooling=true;
}
public static bool ExecMigrationMain()
public static bool ExecMigrationMain(string connString)
{
// esecuzione migrazione
var migrateTask = Task.Run(async () => await DbAdmin.migrateDbMain());
var migrateTask = Task.Run(async () => await DbAdmin.migrateDbMain(connString));
migrateTask.Wait();
return migrateTask.Result;
}
@@ -48,9 +67,47 @@ namespace MagMan.Data.Tenant
{
DATABASE_SERV = server;
DATABASE_NAME = $"MagMan_{nKey:000000}";
CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None";
CONNECTION_STRING = $"server={DATABASE_SERV};port=3306;database={DATABASE_NAME};uid={DATABASE_USER};pwd={DATABASE_PWD};sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
//LoadBalance=RoundRobin;Pooling=true;
}
public static ServerVersion MysqlServerVersion(string connString)
{
// fix come da https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/issues/1859
//Log.Info($"MysqlServerVersion | {connString}");
//ServerVersion serverVersion = ServerVersion.Parse("10.11.13-MariaDB");
ServerVersion serverVersion = ServerVersion.Parse("10.5.25-mysql");
bool versOk = false;
try
{
serverVersion = ServerVersion.AutoDetect(connString);
versOk = true;
}
catch (Exception exc)
{
Log.Error($"Eccezione in verifica versione server ServerVersion.AutoDetect: {Environment.NewLine}{exc}");
}
if (!versOk)
{
try
{
serverVersion = CustomAutoDetect(connString);
versOk = true;
}
catch (Exception exc)
{
Log.Error($"Eccezione in verifica versione server CustomAutoDetect: {Environment.NewLine}{exc}");
}
}
return serverVersion;
}
#endregion Public Methods
#region Private Fields
private static Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
}
}
+30
View File
@@ -5,6 +5,7 @@ using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MagMan.Data.Tenant.Services;
namespace MagMan.Data.Tenant.DbModels
{
@@ -28,5 +29,34 @@ namespace MagMan.Data.Tenant.DbModels
/// Codice Alias in cui viene convertito
/// </summary>
public string ValueAlias { get; set; } = "";
/// <summary>
/// Indica se il record sia attivo/valido (per cancellazione logica online e fisica in remoto)
/// </summary>
public bool IsActive { get; set; } = true;
public override bool Equals(object? obj)
{
if (obj == null)
return false;
if (!(obj is AliasModel item))
return false;
if (Family != item.Family)
return false;
if (ValueOriginal != item.ValueOriginal)
return false;
if (ValueAlias != item.ValueAlias)
return false;
return true;
}
public override int GetHashCode()
{
return base.GetHashCode();
}
}
}
@@ -0,0 +1,48 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.DbModels
{
[Table("DayStat")]
public class DayStatModel
{
[Key, Column("DayId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int DayId { get; set; }
/// <summary>
/// Id macchina (diMagMan)
/// </summary>
public int MachineID { get; set; } = 0;
/// <summary>
/// Data di riferimento
/// </summary>
public DateTime DtRif { get; set; } = DateTime.MinValue;
/// <summary>
/// Ope apertura disponibili
/// </summary>
public double OreDis { get; set; } = 0;
/// <summary>
/// Ore lavorate effettive
/// </summary>
public double OreLav { get; set; } = 0;
[NotMapped]
public double OEE
{
get
{
double denom = OreDis > 0 ? OreDis : 1;
return OreLav / denom;
}
}
}
}
+26
View File
@@ -0,0 +1,26 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.DbModels
{
[Table("AnagEventi")]
public class EventModel
{
[Key]
public int IdxEv { get; set; } = 0;
public string Nome { get; set; } = "";
public string TabAzione { get; set; } = "";
public string Azione { get; set; } = "";
public string KeyEvento { get; set; } = "";
public bool EventoTablet { get; set; } = false;
public string NoteEvento { get; set; } = "";
public string CssClass { get; set; } = "";
public string Icon { get; set; } = "";
}
}
+14 -67
View File
@@ -24,91 +24,38 @@ namespace MagMan.Data.Tenant.DbModels
[Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int LogDbId { get; set; }
/// <summary>
/// Key di riferimento per il progetto
/// </summary>
public int KeyNum { get; set; } = 0;
/// <summary>
/// Id macchina (diMagMan)
/// </summary>
public int MachineID { get; set; } = 0;
/// <summary>
/// Key di riferimento per il progetto
/// Progetto di riferimento (CloudId)
/// </summary>
public int KeyNum { get; set; } = 0;
#if false
/// <summary>
/// Codice Allarme
/// </summary>
[Column("AlarmCode")]
public string AlarmCode { get; set; } = "";
public int ProjDbId { get; set; }
/// <summary>
/// Data Evento
/// Data Registrazione
/// </summary>
[Column("AlarmDtEvent")]
public DateTime AlarmDatetime { get; set; } = DateTime.Now;
/// <summary>
/// Messaggio Allarme
/// </summary>
[Column("AlarmMessage")]
public string AlarmMessage { get; set; } = "";
/// <summary>
/// Alarm Operation
/// </summary>
[Column("AlarmOperation")]
public int AlarmOperation { get; set; } = 0;
/// <summary>
/// Alarm Type
/// </summary>
[Column("AlarmType")]
public int AlarmType { get; set; } = 0;
/// <summary>
/// Esaecuzione comando corretta
/// </summary>
[Column("CommExecuted")]
public bool CommandExecutedCorrectly { get; set; } = false;
[Column("DtEvent")]
public DateTime DtEvent { get; set; } = DateTime.Now;
/// <summary>
/// Stato da enum Core
/// </summary>
[Column("CommandState")]
public Core.ConstMachComm.CommandStates CommandState { get; set; } = Core.ConstMachComm.CommandStates.NULL;
/// <summary>
/// Tipo Comando da enum Core
/// </summary>
[Column("CommandType")]
public Core.ConstMachComm.LogCommandTypes CommandType { get; set; } = Core.ConstMachComm.LogCommandTypes.NULL;
/// <summary>
/// Descrizione
/// </summary>
[Column("Description")]
public string Description { get; set; } = "";
/// <summary>
/// New OP State
/// </summary>
[Column("NewOpState")]
public int NewOpState { get; set; } = 0;
#endif
/// <summary>
/// Stato da enum Core
/// </summary>
[Column("ResultType")]
public ResultTypes ResultType { get; set; } = ResultTypes.NULL;
[Column("EvType")]
public MachLogTypes EvType { get; set; } = MachLogTypes.NULL;
/// <summary>
/// Indirizzo VAR
/// </summary>
[Column("VarAddress")]
public string VarAddress { get; set; } = "";
[Column("SupervId")]
public string SupervId { get; set; } = "";
/// <summary>
/// Valore VAR
@@ -0,0 +1,44 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.DbModels
{
/// <summary>
/// Tabella dei grezzi
/// </summary>
[Table("MachGroupList")]
public class MachGroupModel
{
[Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int MachGroupDbId { get; set; }
/// <summary>
/// Id geometrico Grezzo (barra intera)
/// </summary>
[Column("MachGroupId")]
public int MachGroupId { get; set; }
/// <summary>
/// Proj di appartenenza
/// </summary>
public int ProjDbId { get; set; }
/// <summary>
/// Data Start
/// </summary>
[Column("DtStart")]
public DateTime DtStart { get; set; }
/// <summary>
/// Data End
/// </summary>
[Column("DtEnd")]
public DateTime DtEnd { get; set; }
}
}
+55
View File
@@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.DbModels
{
/// <summary>
/// Tabella delle singole istanze prodotte
/// </summary>
[Table("PartList")]
public class PartModel
{
[Key, Column("DbId"), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public int PartDbId { get; set; }
/// <summary>
/// Id geometrico Barra Lavorata
/// </summary>
[Column("PartId")]
public int PartId { get; set; }
/// <summary>
/// MachGroup di appartenenza
/// </summary>
[Column("MachGroupId")]
public int MachGroupId { get; set; } = 0;
/// <summary>
/// Proj di appartenenza
/// </summary>
public int ProjDbId { get; set; }
/// <summary>
/// Data Start
/// </summary>
[Column("DtStart")]
public DateTime DtStart { get; set; }
/// <summary>
/// Data End
/// </summary>
[Column("DtEnd")]
public DateTime DtEnd { get; set; }
#if false
[ForeignKey("MachGroupId")]
public virtual MachGroupModel MachGroupNav { get; set; }
#endif
}
}
+26
View File
@@ -108,6 +108,32 @@ namespace MagMan.Data.Tenant.DbModels
/// </summary>
public double ProcTimeReal { get; set; } = 0;
/// <summary>
/// Avanzamento in percentuale (tipicamente barre fatte / da fare)
/// </summary>
public double ProgPerc
{
get
{
double answ = 0;
if (ValMax > 0)
{
answ = ValAct / ValMax;
}
return answ;
}
}
/// <summary>
/// Avanzamento (tipicamente barre fatte)
/// </summary>
public double ValAct { get; set; } = 0;
/// <summary>
/// Valore finale atteso (tipicamente barre da fare)
/// </summary>
public double ValMax { get; set; } = 1;
/// <summary>
/// Record attivo (se false == cancellazione logica)
/// </summary>
+3 -3
View File
@@ -32,14 +32,14 @@ namespace MagMan.Data.Tenant.DbModels
public int QtyAvail { get; set; } = 0;
/// <summary>
/// Check if is a Remnant
/// Bool for logical delete (cloud and on PC...)
/// </summary>
public bool IsActive { get; set; } = false;
public bool IsDeleted { get; set; } = false;
/// <summary>
/// Check if is a Remnant
/// </summary>
public bool IsRemn { get; set; } = false;
public bool IsRemn { get; set; } = true;
/// <summary>
/// Location
@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace MagMan.Data.Tenant.DbModels
{
[Table("AnagStati")]
public class StatusModel
{
[Key]
public int IdxStato { get; set; } = 0;
public string Descrizione { get; set; } = "";
public string Semaforo { get; set; } = "";
public int Priorita { get; set; } = 0;
public string ClasseTempo { get; set; } = "";
public bool ShowArticolo { get; set; } = false;
public string KeyStato { get; set; } = "";
public string NoteStato { get; set; } = "";
}
}
+2 -1
View File
@@ -1,6 +1,7 @@
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -10,7 +11,7 @@ namespace MagMan.Data.Tenant.DbModels
/// <summary>
/// Classe fake x il conteggio tabelle e check preliminari
/// </summary>
[Keyless]
[NotMapped]
public class TableCount
{
#region Public Properties
+21 -7
View File
@@ -4,6 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Configurations>Debug;Release</Configurations>
</PropertyGroup>
<ItemGroup>
@@ -20,20 +21,21 @@
<PackageReference Include="Blazored.LocalStorage" Version="4.3.0" />
<PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
<PackageReference Include="MailKit" Version="4.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.28">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.25" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.28" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.28">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.2.7" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.1" />
<PackageReference Include="StackExchange.Redis" Version="2.7.10" />
<PackageReference Include="NLog" Version="5.2.8" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.3" />
<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
</ItemGroup>
<ItemGroup>
@@ -45,4 +47,16 @@
<Folder Include="Migrations\" />
</ItemGroup>
<ItemGroup>
<None Update="SqlScripts\Stored\stp_removeLogMachine.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SqlScripts\Stored\stp_mergeLogMachine.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="SqlScripts\Stored\stp_recalcDailyMGP.sql">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>
+68 -64
View File
@@ -14,13 +14,6 @@ namespace MagMan.Data.Tenant
{
public partial class MagManContext : DbContext
{
#region Private Fields
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
#endregion Private Fields
#region Public Constructors
public MagManContext()
@@ -28,6 +21,7 @@ namespace MagMan.Data.Tenant
// default
connString = DbConfig.CONNECTION_STRING;
}
public MagManContext(string currConnString)
{
connString = currConnString;
@@ -37,70 +31,23 @@ namespace MagMan.Data.Tenant
#region Public Properties
public virtual DbSet<ConfigModel> DbSetConfig { get; set; } = null!;
public virtual DbSet<RawItemModel> DbSetItems { get; set; } = null!;
public virtual DbSet<MaterialModel> DbSetMaterials { get; set; } = null!;
public virtual DbSet<RawItemModel> DbSetRawItem { get; set; } = null!;
public virtual DbSet<AliasModel> DbSetAlias { get; set; } = null!;
public virtual DbSet<ConfigModel> DbSetConfig { get; set; } = null!;
public virtual DbSet<DayStatModel> DbSetDayStat { get; set; } = null!;
public virtual DbSet<EventModel> DbSetEventList { get; set; } = null!;
public virtual DbSet<RawItemModel> DbSetItems { get; set; } = null!;
public virtual DbSet<LogMachineModel> DbSetLogMac { get; set; } = null!;
public virtual DbSet<MachGroupModel> DbSetMachGrp { get; set; } = null!;
public virtual DbSet<MaterialModel> DbSetMaterials { get; set; } = null!;
public virtual DbSet<MovMagModel> DbSetMovMag { get; set; } = null!;
public virtual DbSet<PartModel> DbSetPart { get; set; } = null!;
public virtual DbSet<ProjModel> DbSetProjects { get; set; } = null!;
public virtual DbSet<RequestPlanModel> DbSetReqPlan { get; set; } = null!;
public virtual DbSet<ResourceModel> DbSetResources { get; set; } = null!;
public virtual DbSet<MovMagModel> DbSetMovMag { get; set; } = null!;
#if false
public virtual DbSet<PrintJobQueueModel> DbSetPrintJob { get; set; } = null!;
#endif
private string connString = "";
public virtual DbSet<StatusModel> DbSetStatusList { get; set; } = null!;
#endregion Public Properties
#region Private Methods
partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
#endregion Private Methods
#region Protected Methods
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if (!optionsBuilder.IsConfigured)
{
#if DEBUG
connString = "Server=localhost;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
#endif
var serverVersion = ServerVersion.AutoDetect(connString);
optionsBuilder.UseMySql(connString, serverVersion);
}
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
foreach (var relationship in modelBuilder.Model.GetEntityTypes().SelectMany(e => e.GetForeignKeys()))
{
relationship.DeleteBehavior = DeleteBehavior.Restrict;
}
modelBuilder.Entity<ConfigModel>(entity =>
{
entity.Property(e => e.ValStd)
.HasComment("Valore di default/riferimento per la variabile");
});
modelBuilder.Entity<AliasModel>()
.HasKey(c => new { c.Family, c.ValueOriginal});
modelBuilder.Seed();
OnModelCreatingPartial(modelBuilder);
}
#endregion Protected Methods
#region Public Methods
public void DbForceMigrate()
@@ -118,5 +65,62 @@ namespace MagMan.Data.Tenant
}
#endregion Public Methods
#region Protected Methods
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
if (!optionsBuilder.IsConfigured)
{
// commentato x test su cluster in ufficio
#if DEBUG
//connString = "Server=localhost;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
////connString = "Server=mdb03.ufficio;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;";
connString = "Server=mdb.ufficio;port=3306;database=MagMan_000470;uid=MagMan_DbUser;pwd=viad@nte16!;sslmode=None;Connection Lifetime=60;Connection Timeout=15;DefaultCommandTimeout=30;ConnectionIdleTimeout=30;ConnectionLifeTime=300;";
#endif
var serverVersion = DbConfig.MysqlServerVersion(connString);
optionsBuilder.UseMySql(connString, serverVersion, options => options.EnableRetryOnFailure(
maxRetryCount: 5,
maxRetryDelay: TimeSpan.FromSeconds(10),
errorNumbersToAdd: null)
);
}
}
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
foreach (var relationship in modelBuilder.Model.GetEntityTypes().SelectMany(e => e.GetForeignKeys()))
{
relationship.DeleteBehavior = DeleteBehavior.Restrict;
}
modelBuilder.Entity<ConfigModel>(entity =>
{
entity.Property(e => e.ValStd)
.HasComment("Valore di default/riferimento per la variabile");
});
modelBuilder.Entity<AliasModel>()
.HasKey(c => new { c.Family, c.ValueOriginal });
modelBuilder.Seed();
OnModelCreatingPartial(modelBuilder);
}
#endregion Protected Methods
#region Private Fields
private static NLog.Logger Log = LogManager.GetCurrentClassLogger();
private string connString = "";
#endregion Private Fields
#region Private Methods
partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
#endregion Private Methods
}
}
@@ -0,0 +1,351 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240404092207_AddAliasLogicalDelete")]
partial class AddAliasLogicalDelete
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,26 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddAliasLogicalDelete : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<bool>(
name: "IsActive",
table: "AliasList",
type: "tinyint(1)",
nullable: false,
defaultValue: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "IsActive",
table: "AliasList");
}
}
}
@@ -0,0 +1,394 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240427093933_AddLogMachine")]
partial class AddLogMachine
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,52 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddLogMachine : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "LogMachine",
columns: table => new
{
DbId = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
KeyNum = table.Column<int>(type: "int", nullable: false),
MachineID = table.Column<int>(type: "int", nullable: false),
ProjDbId = table.Column<int>(type: "int", nullable: false),
DtEvent = table.Column<DateTime>(type: "datetime(6)", nullable: false),
EvType = table.Column<int>(type: "int", nullable: false),
SupervId = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
VarValue = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
table.PrimaryKey("PK_LogMachine", x => x.DbId);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_LogMachine_KeyNum",
table: "LogMachine",
column: "KeyNum");
migrationBuilder.CreateIndex(
name: "IX_LogMachine_MachineID",
table: "LogMachine",
column: "MachineID");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "LogMachine");
}
}
}
@@ -0,0 +1,476 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240502075440_AddDailyStat")]
partial class AddDailyStat
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,78 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddDailyStat : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "DayStat",
columns: table => new
{
DayId = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
MachineID = table.Column<int>(type: "int", nullable: false),
DtRif = table.Column<DateTime>(type: "datetime(6)", nullable: false),
OreDis = table.Column<double>(type: "double", nullable: false),
OreLav = table.Column<double>(type: "double", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_DayStat", x => x.DayId);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "MachGroupList",
columns: table => new
{
DbId = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
MachGroupId = table.Column<int>(type: "int", nullable: false),
ProjDbId = table.Column<int>(type: "int", nullable: false),
DtStart = table.Column<DateTime>(type: "datetime(6)", nullable: false),
DtEnd = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_MachGroupList", x => x.DbId);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "PartList",
columns: table => new
{
DbId = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
PartId = table.Column<int>(type: "int", nullable: false),
MachGroupId = table.Column<int>(type: "int", nullable: false),
ProjDbId = table.Column<int>(type: "int", nullable: false),
DtStart = table.Column<DateTime>(type: "datetime(6)", nullable: false),
DtEnd = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_PartList", x => x.DbId);
})
.Annotation("MySql:CharSet", "utf8mb4");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "DayStat");
migrationBuilder.DropTable(
name: "MachGroupList");
migrationBuilder.DropTable(
name: "PartList");
}
}
}
@@ -0,0 +1,476 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240502115056_AddStoredProc01")]
partial class AddStoredProc01
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,46 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System.Reflection;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddStoredProc01 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
// aggiunta stored
addStored(migrationBuilder, "stp_recalcDailyMGP");
addStored(migrationBuilder, "stp_mergeLogMachine");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
// rimozione stored
remStored(migrationBuilder, "stp_recalcDailyMGP");
remStored(migrationBuilder, "stp_mergeLogMachine");
}
private void addView(MigrationBuilder migrationBuilder, string objName)
{
string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "SqlScripts", "View", $"{objName}.sql");
string viewBody = File.ReadAllText(path);
migrationBuilder.Sql(viewBody);
}
private void addStored(MigrationBuilder migrationBuilder, string objName)
{
string path = Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), "SqlScripts", "Stored", $"{objName}.sql");
string viewBody = File.ReadAllText(path);
migrationBuilder.Sql(viewBody);
}
private void remView(MigrationBuilder migrationBuilder, string objName)
{
migrationBuilder.Sql($"DROP VIEW IF EXISTS {objName};");
}
private void remStored(MigrationBuilder migrationBuilder, string objName)
{
migrationBuilder.Sql($"DROP PROCEDURE IF EXISTS {objName};");
}
}
}
@@ -0,0 +1,555 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240502175352_AddEvStateList")]
partial class AddEvStateList
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b =>
{
b.Property<int>("IdxEv")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Azione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CssClass")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("EventoTablet")
.HasColumnType("tinyint(1)");
b.Property<string>("Icon")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Nome")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("TabAzione")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("IdxEv");
b.ToTable("AnagEventi");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.StatusModel", b =>
{
b.Property<int>("IdxStato")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClasseTempo")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Descrizione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("Priorita")
.HasColumnType("int");
b.Property<string>("Semaforo")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("ShowArticolo")
.HasColumnType("tinyint(1)");
b.HasKey("IdxStato");
b.ToTable("AnagStati");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,75 @@
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddEvStateList : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "AnagEventi",
columns: table => new
{
IdxEv = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
Nome = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
TabAzione = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Azione = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
KeyEvento = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
EventoTablet = table.Column<bool>(type: "tinyint(1)", nullable: false),
NoteEvento = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
CssClass = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Icon = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
table.PrimaryKey("PK_AnagEventi", x => x.IdxEv);
})
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "AnagStati",
columns: table => new
{
IdxStato = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
Descrizione = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Semaforo = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
Priorita = table.Column<int>(type: "int", nullable: false),
ClasseTempo = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
ShowArticolo = table.Column<bool>(type: "tinyint(1)", nullable: false),
KeyStato = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4"),
NoteStato = table.Column<string>(type: "longtext", nullable: false)
.Annotation("MySql:CharSet", "utf8mb4")
},
constraints: table =>
{
table.PrimaryKey("PK_AnagStati", x => x.IdxStato);
})
.Annotation("MySql:CharSet", "utf8mb4");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "AnagEventi");
migrationBuilder.DropTable(
name: "AnagStati");
}
}
}
@@ -0,0 +1,561 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240629092727_AddProjProgress01")]
partial class AddProjProgress01
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.28")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b =>
{
b.Property<int>("IdxEv")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Azione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CssClass")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("EventoTablet")
.HasColumnType("tinyint(1)");
b.Property<string>("Icon")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Nome")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("TabAzione")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("IdxEv");
b.ToTable("AnagEventi");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.Property<double>("ValAct")
.HasColumnType("double");
b.Property<double>("ValMax")
.HasColumnType("double");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.StatusModel", b =>
{
b.Property<int>("IdxStato")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClasseTempo")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Descrizione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("Priorita")
.HasColumnType("int");
b.Property<string>("Semaforo")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("ShowArticolo")
.HasColumnType("tinyint(1)");
b.HasKey("IdxStato");
b.ToTable("AnagStati");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,37 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class AddProjProgress01 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<double>(
name: "ValAct",
table: "ProjList",
type: "double",
nullable: false,
defaultValue: 0.0);
migrationBuilder.AddColumn<double>(
name: "ValMax",
table: "ProjList",
type: "double",
nullable: false,
defaultValue: 1.0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ValAct",
table: "ProjList");
migrationBuilder.DropColumn(
name: "ValMax",
table: "ProjList");
}
}
}
@@ -0,0 +1,561 @@
// <auto-generated />
using System;
using MagMan.Data.Tenant;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
[DbContext(typeof(MagManContext))]
[Migration("20240805122833_RawItemRenActiveToDelete")]
partial class RawItemRenActiveToDelete
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.28")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
{
b.Property<string>("Family")
.HasColumnType("varchar(255)");
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Family", "ValueOriginal");
b.ToTable("AliasList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ConfigModel", b =>
{
b.Property<string>("KeyName")
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(0);
b.Property<string>("Note")
.IsRequired()
.HasMaxLength(250)
.HasColumnType("varchar(250)")
.HasColumnOrder(3);
b.Property<string>("Val")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(1);
b.Property<string>("ValStd")
.IsRequired()
.HasMaxLength(50)
.HasColumnType("varchar(50)")
.HasColumnOrder(2)
.HasComment("Valore di default/riferimento per la variabile");
b.HasKey("KeyName");
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b =>
{
b.Property<int>("IdxEv")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Azione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CssClass")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("EventoTablet")
.HasColumnType("tinyint(1)");
b.Property<string>("Icon")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Nome")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("TabAzione")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("IdxEv");
b.ToTable("AnagEventi");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("MatCode")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("MatDesc")
.IsRequired()
.HasColumnType("longtext");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("MatId");
b.ToTable("MaterialsList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.Property<int>("MovID")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRec")
.HasColumnType("datetime(6)");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyRec")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("MovID");
b.HasIndex("RawItemId");
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("BTLFileName")
.IsRequired()
.HasColumnType("longtext");
b.Property<DateTime>("DtCreated")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtLastAction")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtSchedule")
.HasColumnType("datetime(6)");
b.Property<DateTime>("DtStartProd")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsArchived")
.HasColumnType("tinyint(1)");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<string>("ListName")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Machine")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("PType")
.HasColumnType("int");
b.Property<double>("ProcTimeEst")
.HasColumnType("double");
b.Property<double>("ProcTimeReal")
.HasColumnType("double");
b.Property<string>("ProjDescription")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("ProjExtDbId")
.HasColumnType("int");
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.Property<double>("ValAct")
.HasColumnType("double");
b.Property<double>("ValMax")
.HasColumnType("double");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
b.HasIndex("IsArchived");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.HasIndex("ProjExtDbId");
b.ToTable("ProjList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.Property<int>("RawItemId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsDeleted")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
.HasColumnType("tinyint(1)");
b.Property<decimal>("LMm")
.HasColumnType("decimal(65,30)");
b.Property<string>("Location")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("MatId")
.HasColumnType("int");
b.Property<string>("Note")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("QtyAvail")
.HasColumnType("int");
b.Property<decimal>("WMm")
.HasColumnType("decimal(65,30)");
b.HasKey("RawItemId");
b.HasIndex("MatId");
b.ToTable("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Property<int>("RequestId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("DtRequest")
.HasColumnType("datetime(6)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<int>("ReqState")
.HasColumnType("int");
b.HasKey("RequestId");
b.ToTable("RequestPlan");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.Property<int>("ResourceId")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Qty")
.HasColumnType("int");
b.Property<int>("RawItemId")
.HasColumnType("int");
b.Property<int>("RequestId")
.HasColumnType("int");
b.HasKey("ResourceId");
b.HasIndex("RawItemId");
b.HasIndex("RequestId");
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.StatusModel", b =>
{
b.Property<int>("IdxStato")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClasseTempo")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Descrizione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("Priorita")
.HasColumnType("int");
b.Property<string>("Semaforo")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("ShowArticolo")
.HasColumnType("tinyint(1)");
b.HasKey("IdxStato");
b.ToTable("AnagStati");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RawItemModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.MaterialModel", "MaterialNav")
.WithMany("RawItemList")
.HasForeignKey("MatId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("MaterialNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ResourceModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
.WithMany()
.HasForeignKey("RawItemId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.HasOne("MagMan.Data.Tenant.DbModels.RequestPlanModel", "RequestNav")
.WithMany("ResourcesList")
.HasForeignKey("RequestId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ItemNav");
b.Navigation("RequestNav");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Navigation("RawItemList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.RequestPlanModel", b =>
{
b.Navigation("ResourcesList");
});
#pragma warning restore 612, 618
}
}
}
@@ -0,0 +1,25 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace MagMan.Data.Tenant.Migrations
{
public partial class RawItemRenActiveToDelete : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "IsActive",
table: "RawItemList",
newName: "IsDeleted");
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.RenameColumn(
name: "IsDeleted",
table: "RawItemList",
newName: "IsActive");
}
}
}
@@ -16,7 +16,7 @@ namespace MagMan.Data.Tenant.Migrations
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "6.0.25")
.HasAnnotation("ProductVersion", "6.0.28")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.AliasModel", b =>
@@ -27,6 +27,9 @@ namespace MagMan.Data.Tenant.Migrations
b.Property<string>("ValueOriginal")
.HasColumnType("varchar(255)");
b.Property<bool>("IsActive")
.HasColumnType("tinyint(1)");
b.Property<string>("ValueAlias")
.IsRequired()
.HasColumnType("longtext");
@@ -67,6 +70,142 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("Config");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.DayStatModel", b =>
{
b.Property<int>("DayId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DayId");
b.Property<DateTime>("DtRif")
.HasColumnType("datetime(6)");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<double>("OreDis")
.HasColumnType("double");
b.Property<double>("OreLav")
.HasColumnType("double");
b.HasKey("DayId");
b.ToTable("DayStat");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.EventModel", b =>
{
b.Property<int>("IdxEv")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Azione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("CssClass")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("EventoTablet")
.HasColumnType("tinyint(1)");
b.Property<string>("Icon")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Nome")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteEvento")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("TabAzione")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("IdxEv");
b.ToTable("AnagEventi");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.LogMachineModel", b =>
{
b.Property<int>("LogDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEvent")
.HasColumnType("datetime(6)")
.HasColumnName("DtEvent");
b.Property<int>("EvType")
.HasColumnType("int")
.HasColumnName("EvType");
b.Property<int>("KeyNum")
.HasColumnType("int");
b.Property<int>("MachineID")
.HasColumnType("int");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.Property<string>("SupervId")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("SupervId");
b.Property<string>("VarValue")
.IsRequired()
.HasColumnType("longtext")
.HasColumnName("VarValue");
b.HasKey("LogDbId");
b.HasIndex("KeyNum");
b.HasIndex("MachineID");
b.ToTable("LogMachine");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MachGroupModel", b =>
{
b.Property<int>("MachGroupDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("MachGroupDbId");
b.ToTable("MachGroupList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MaterialModel", b =>
{
b.Property<int>("MatId")
@@ -125,6 +264,37 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("MovMag");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.PartModel", b =>
{
b.Property<int>("PartDbId")
.ValueGeneratedOnAdd()
.HasColumnType("int")
.HasColumnName("DbId");
b.Property<DateTime>("DtEnd")
.HasColumnType("datetime(6)")
.HasColumnName("DtEnd");
b.Property<DateTime>("DtStart")
.HasColumnType("datetime(6)")
.HasColumnName("DtStart");
b.Property<int>("MachGroupId")
.HasColumnType("int")
.HasColumnName("MachGroupId");
b.Property<int>("PartId")
.HasColumnType("int")
.HasColumnName("PartId");
b.Property<int>("ProjDbId")
.HasColumnType("int");
b.HasKey("PartDbId");
b.ToTable("PartList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.ProjModel", b =>
{
b.Property<int>("ProjDbId")
@@ -186,6 +356,12 @@ namespace MagMan.Data.Tenant.Migrations
b.Property<int>("ProjExtId")
.HasColumnType("int");
b.Property<double>("ValAct")
.HasColumnType("double");
b.Property<double>("ValMax")
.HasColumnType("double");
b.HasKey("ProjDbId");
b.HasIndex("IsActive");
@@ -210,7 +386,7 @@ namespace MagMan.Data.Tenant.Migrations
b.Property<decimal>("HMm")
.HasColumnType("decimal(65,30)");
b.Property<bool>("IsActive")
b.Property<bool>("IsDeleted")
.HasColumnType("tinyint(1)");
b.Property<bool>("IsRemn")
@@ -290,6 +466,43 @@ namespace MagMan.Data.Tenant.Migrations
b.ToTable("ResourceList");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.StatusModel", b =>
{
b.Property<int>("IdxStato")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("ClasseTempo")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Descrizione")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("KeyStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("NoteStato")
.IsRequired()
.HasColumnType("longtext");
b.Property<int>("Priorita")
.HasColumnType("int");
b.Property<string>("Semaforo")
.IsRequired()
.HasColumnType("longtext");
b.Property<bool>("ShowArticolo")
.HasColumnType("tinyint(1)");
b.HasKey("IdxStato");
b.ToTable("AnagStati");
});
modelBuilder.Entity("MagMan.Data.Tenant.DbModels.MovMagModel", b =>
{
b.HasOne("MagMan.Data.Tenant.DbModels.RawItemModel", "ItemNav")
+624 -51
View File
@@ -1,37 +1,25 @@
using MagMan.Core;
using MagMan.Core.DTO;
using MagMan.Core.Services;
using MagMan.Data.Tenant.Controllers;
using MagMan.Data.Tenant.DbModels;
using Microsoft.Extensions.Configuration;
using Newtonsoft.Json;
using NLog;
using NLog.Fluent;
using StackExchange.Redis;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Runtime;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using static MagMan.Core.Enums;
namespace MagMan.Data.Tenant.Services
{
public class TenantService : BaseServ
public class TenantService : BaseServ, IDisposable
{
#region Public Fields
public TenantController dbController = null!;
#endregion Public Fields
#region Public Constructors
public TenantService(IConfiguration configuration, IConnectionMultiplexer redisConnMult)
{
Log.Info("TenantService starting...");
_configuration = configuration;
// Conf cache
redisConn = redisConnMult;
redisDb = this.redisConn.GetDatabase();
@@ -43,7 +31,12 @@ namespace MagMan.Data.Tenant.Services
};
// cod app
CodApp = _configuration["CodApp"];
CodApp = _configuration.GetValue<string>("OptConf:CodApp");
// gestione parallelismo...
numPar = _configuration.GetValue<int>("OptConf:NumPar");
// DB
DbServerAddr = _configuration["DbConfig:Server"];
dbController = new TenantController();
@@ -55,6 +48,166 @@ namespace MagMan.Data.Tenant.Services
#region Public Methods
public static bool hasDecimal(decimal num)
{
return (num - Math.Round(num) != 0);
}
/// <summary>
/// Elimina Alias da magazzino + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="rec2del">Alias da eliminare</param>
/// <returns></returns>
public async Task<bool> AliasDelete(int nKey, AliasModel rec2del)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.AliasDelete(cString, rec2del);
if (fatto)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during AliasDelete:{Environment.NewLine}{exc}");
}
return fatto;
}
/// <summary>
/// Converte il DTO in AliasModel
/// </summary>
/// <param name="origItem"></param>
/// <returns></returns>
public AliasModel AliasFromDto(AliasDTO origItem, string family)
{
AliasModel answ = new AliasModel()
{
Family = family,
ValueOriginal = origItem.ValOrig,
ValueAlias = origItem.ValAlias,
IsActive = origItem.IsActive
};
return answ;
}
/// <summary>
/// Lista Alias gestiti a magazzino
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="family">Famiglia richiesta, "" = tutti</param>
/// <returns></returns>
public async Task<List<AliasModel>> AliasGetFilt(int nKey, string family)
{
string source = "DB";
string cString = ConnString(nKey);
List<AliasModel>? dbResult = new List<AliasModel>();
try
{
string dType = string.IsNullOrEmpty(family) ? "***" : family;
string currKey = $"{Const.rKeyConfig}:{nKey}:Alias:{dType}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty(rawData))
{
source = "REDIS";
var tempResult = JsonConvert.DeserializeObject<List<AliasModel>>(rawData);
if (tempResult == null)
{
dbResult = new List<AliasModel>();
}
else
{
dbResult = tempResult;
}
}
else
{
dbResult = dbController.AliasGetFilt(cString, family);
rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, LongCache);
// per evitare loopback uso deserialize...
var tempResult = JsonConvert.DeserializeObject<List<AliasModel>>(rawData);
if (tempResult != null)
{
dbResult = tempResult;
}
}
if (dbResult == null)
{
dbResult = new List<AliasModel>();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"AliasGetFilt | {source} in: {ts.TotalMilliseconds} ms");
}
catch (Exception exc)
{
Log.Error($"Error during AliasGetFilt:{Environment.NewLine}{exc}");
}
return dbResult;
}
/// <summary>
/// Update record Alias + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item da aggiornare/inserire</param>
/// <returns></returns>
public async Task<bool> AliasUpsert(int nKey, AliasModel currItem)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.AliasUpsert(cString, currItem);
if (fatto)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during AliasUpsert:{Environment.NewLine}{exc}");
}
return fatto;
}
/// <summary>
/// Update lista Alias + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="listItem">Elenco Item da aggiornare/inserire</param>
/// <returns></returns>
public async Task<bool> AliasUpsert(int nKey, List<AliasModel> listItem)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.AliasUpsert(cString, listItem);
if (fatto)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during AliasUpsert:{Environment.NewLine}{exc}");
}
return fatto;
}
public void Dispose()
{
dbController.Dispose();
}
/// <summary>
/// Elimina Item da magazzino + refresh cache
/// </summary>
@@ -80,13 +233,34 @@ namespace MagMan.Data.Tenant.Services
return fatto;
}
/// <summary>
/// Converte il DTO in ItemModel, colmando eventuale mancante nelle note dell'item
/// </summary>
/// <param name="origItem">DTO di partenza</param>
/// <param name="nKey">Key di riferimento</param>
/// <returns></returns>
public RawItemModel ItemFromDto(ItemDTO origItem, int nKey)
{
RawItemModel answ = ItemFromDto(origItem);
if (string.IsNullOrEmpty(answ.Note))
{
string cString = ConnString(nKey);
var matRec = dbController.MaterialGetFilt(cString, origItem.MatCloudId, false).FirstOrDefault();
if (matRec != null)
{
answ.Note = matRec.MatDesc;
}
}
return answ;
}
/// <summary>
/// Converte il DTO in ItemModel
/// </summary>
/// <param name="origItem">DTO di partenza</param>
/// <param name="isActive">Parametro active da impostare</param>
/// <returns></returns>
public RawItemModel ItemFromDto(ItemDTO origItem, bool isActive)
public RawItemModel ItemFromDto(ItemDTO origItem)
{
RawItemModel answ = new RawItemModel()
{
@@ -95,10 +269,10 @@ namespace MagMan.Data.Tenant.Services
LMm = origItem.LMm,
WMm = origItem.WMm,
HMm = origItem.HMm,
IsDeleted = origItem.IsDeleted,
IsRemn = origItem.IsRemn,
Location = origItem.Location,
QtyAvail = origItem.QtyAvail,
IsActive = isActive
QtyAvail = origItem.QtyAvail
};
return answ;
@@ -159,15 +333,17 @@ namespace MagMan.Data.Tenant.Services
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="matID">ID del materiale x cui filtrare, 0 = tutti</param>
/// <param name="onlyActive">Solo attivi (default) o anche cancellati</param>
/// <returns></returns>
public async Task<List<RawItemModel>> ItemGetByMat(int nKey, int matID)
public async Task<List<RawItemModel>> ItemGetByMat(int nKey, int matID, bool onlyActive)
{
string source = "DB";
string cString = ConnString(nKey);
List<RawItemModel>? dbResult = new List<RawItemModel>();
try
{
string currKey = $"{Const.rKeyConfig}:{nKey}:ItemList:{matID}";
string keyAct = onlyActive ? "ACT" : "ALL";
string currKey = $"{Const.rKeyConfig}:{nKey}:ItemList:{matID}:{keyAct}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
@@ -186,7 +362,7 @@ namespace MagMan.Data.Tenant.Services
}
else
{
dbResult = dbController.ItemGetByMat(cString, matID);
dbResult = dbController.ItemGetByMat(cString, matID, onlyActive);
rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, LongCache);
}
@@ -205,20 +381,81 @@ namespace MagMan.Data.Tenant.Services
return dbResult;
}
/// <summary>
/// Ricerca item da QrCode
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="QrCode">QrCode/Dtmx cercato</param>
/// <returns></returns>
public async Task<RawItemModel> ItemGetByQr(int nKey, string QrCode)
{
RawItemModel? dbResult = new RawItemModel();
string cacheKey = $"{Const.rKeyConfig}:{nKey}:{QrCode}";
string source = "DB";
string cString = ConnString(nKey);
try
{
string currKey = $"{Const.rKeyConfig}:{nKey}:ItemByQr:{QrCode}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty(rawData))
{
source = "REDIS";
var tempResult = JsonConvert.DeserializeObject<RawItemModel>(rawData);
if (tempResult == null)
{
dbResult = new RawItemModel();
}
else
{
dbResult = tempResult;
}
}
else
{
dbResult = dbController.ItemGetByQr(cString, QrCode);
if (dbResult != null && dbResult.ItemDtmx.ToUpper() == QrCode.ToUpper())
{
rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, LongCache);
}
}
if (dbResult == null)
{
dbResult = new RawItemModel();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ItemGetByQr | {source} in: {ts.TotalMilliseconds} ms");
}
catch (Exception exc)
{
Log.Error($"Error during ItemGetByQr:{Environment.NewLine}{exc}");
}
return dbResult;
}
/// <summary>
/// Update record Item per quantità + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item interesato</param>
/// <param name="userId">User corrente (SE applicabile)</param>
/// <param name="msgAdd">
/// Messaggio registrato x variazione positiva (def: M01+: Rettifica Inventariale)
/// </param>
/// <param name="msgRem">
/// Messaggio registrato x variazione negativa (def: M01-: Rettifica Inventariale)
/// </param>
/// <returns></returns>
public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty, string userId)
public async Task<bool> ItemModQty(int nKey, RawItemModel currItem, int deltaQty, string userId, string msgAdd = "M01+: Rettifica Inventariale", string msgRem = "M01-: Rettifica Inventariale")
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.ItemModQty(cString, currItem, deltaQty, userId);
fatto = dbController.ItemModQty(cString, currItem, deltaQty, userId, msgAdd, msgRem);
if (fatto)
{
await FlushRedisCache();
@@ -232,19 +469,46 @@ namespace MagMan.Data.Tenant.Services
}
/// <summary>
/// Update record Item + refresh cache
/// Riattiva Item da magazzino + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item interesato</param>
/// <param name="userId">User corrente (SE applicabile)</param>
/// <param name="rec2react">Item da riattivare</param>
/// <returns></returns>
public async Task<bool> ItemUpdate(int nKey, RawItemModel currItem, string userId)
public async Task<bool> ItemReactiv(int nKey, RawItemModel rec2react)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.ItemUpdate(cString, currItem, userId);
fatto = dbController.ItemReactiv(cString, rec2react);
if (fatto)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during ItemReactiv:{Environment.NewLine}{exc}");
}
return fatto;
}
/// <summary>
/// Update record Item + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item interesato</param>
/// <param name="userId">User corrente (SE applicabile)</param>
/// <param name="forceQty">Se true aggiorna giacenze quantita correnti</param>
/// <param name="ignoreRemn">Se true ignora aggiornamento remnant in cloud</param>
/// <returns></returns>
public async Task<bool> ItemUpdate(int nKey, RawItemModel currItem, string userId, bool forceQty, bool ignoreRemn)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.ItemUpdate(cString, currItem, userId, forceQty, ignoreRemn);
if (fatto)
{
await FlushRedisCache();
@@ -257,6 +521,134 @@ namespace MagMan.Data.Tenant.Services
return fatto;
}
/// <summary>
/// Converte il DTO in ItemModel
/// </summary>
/// <param name="origItem">DTO di partenza</param>
/// <returns></returns>
public LogMachineModel LogMacFromDto(LogMachineDTO origItem, int machineCloudId, int keyNum)
{
LogMachineModel answ = new LogMachineModel()
{
ProjDbId = origItem.ProjCloudId,
DtEvent = origItem.DtEvent,
EvType = origItem.EvType,
MachineID = machineCloudId,
KeyNum = keyNum,
SupervId = origItem.SupervId,
VarValue = origItem.VarValue
};
return answ;
}
/// <summary>
/// Lista Projects gestiti a magazzino
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="machineId">idMacchina di cui si vuole log</param>
/// <param name="numRec">num rec max da recuperare</param>
/// <returns></returns>
public async Task<List<LogMachineModel>> LogMacGetLast(int nKey, int machineId, int numRec)
{
string source = "DB";
string cString = ConnString(nKey);
List<LogMachineModel>? dbResult = new List<LogMachineModel>();
DateTime adesso = DateTime.Now;
try
{
// cache al minuto...
string currKey = $"{Const.rKeyConfig}:{nKey}:LogMacLast:{machineId}:{adesso:yyMMdd}::{adesso:HHmm}:{numRec}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty(rawData))
{
source = "REDIS";
var tempResult = JsonConvert.DeserializeObject<List<LogMachineModel>>(rawData);
if (tempResult == null)
{
dbResult = new List<LogMachineModel>();
}
else
{
dbResult = tempResult;
}
}
else
{
dbResult = dbController.LogMacGetLast(cString, machineId, numRec);
rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, FastCache);
}
if (dbResult == null)
{
dbResult = new List<LogMachineModel>();
}
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"LogMacGetLast | {source} in: {ts.TotalMilliseconds} ms");
}
catch (Exception exc)
{
Log.Error($"Error during LogMacGetLast:{Environment.NewLine}{exc}");
}
return dbResult;
}
/// <summary>
/// Aggiunge/Modifica un record Resource
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="KeyNum">Num Chiave record</param>
/// <param name="machineId">Id Macchina</param>
/// <param name="dtStart">Data inizio set da eliminare</param>
/// <param name="dtEnd">Data fine set da eliminare</param>
/// <returns></returns>
public async Task<int> LogMacRemoveRange(int nKey, int machineId, DateTime dtStart, DateTime dtEnd)
{
int nUpdated = 0;
string cString = ConnString(nKey);
try
{
nUpdated = dbController.LogMacRemoveRange(cString, nKey, machineId, dtStart, dtEnd);
if (nUpdated > 0)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during LogMacRemoveRange:{Environment.NewLine}{exc}");
}
return nUpdated;
}
/// <summary>
/// Aggiunge/Modifica un record Resource
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="recList">Elenco record da aggiungere/aggiornare</param>
/// <returns></returns>
public async Task<int> LogMacUpdate(int nKey, List<LogMachineModel> recList)
{
int nUpdated = 0;
string cString = ConnString(nKey);
try
{
nUpdated = dbController.LogMacUpdate(cString, recList);
if (nUpdated > 0)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during LogMacUpdate:{Environment.NewLine}{exc}");
}
return nUpdated;
}
/// <summary>
/// Elimina Materiale da magazzino + refresh cache
/// </summary>
@@ -287,16 +679,18 @@ namespace MagMan.Data.Tenant.Services
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="withChild">Se true allora include record child (Items)</param>
/// <param name="withRemn">Se true allora include record remnants (Items) nei conteggi qty</param>
/// <returns></returns>
public async Task<List<MaterialDTO>> MaterialDtoGetAll(int nKey, bool withChild)
public async Task<List<MaterialDTO>> MaterialDtoGetAll(int nKey, bool withChild, bool withRemn)
{
string source = "DB";
string cString = ConnString(nKey);
List<MaterialDTO>? dbResult = new List<MaterialDTO>();
try
{
string dType = withChild ? "MaterialsDtoFull" : "MaterialsDto";
string currKey = $"{Const.rKeyConfig}:{nKey}:{dType}";
string dType = withChild ? "MatDtoFull" : "MatDto";
string remn = withRemn ? "All" : "Buy";
string currKey = $"{Const.rKeyConfig}:{nKey}:{remn}:{dType}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
@@ -315,7 +709,7 @@ namespace MagMan.Data.Tenant.Services
}
else
{
dbResult = dbController.MaterialDtoGetAll(cString, withChild);
dbResult = dbController.MaterialDtoGetAll(cString, withChild, withRemn);
rawData = JsonConvert.SerializeObject(dbResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, LongCache);
// per evitare loopback uso deserialize...
@@ -404,16 +798,41 @@ namespace MagMan.Data.Tenant.Services
/// </summary>
/// <param name="origItem"></param>
/// <returns></returns>
public MaterialModel? MaterialFromDto(MaterialDTO? origItem)
public MaterialModel MaterialFromDto(MaterialDTO origItem)
{
MaterialModel? answ = null;
MaterialModel answ = new MaterialModel();
// calcolo descrizione se fosse vuota
string matDescr = origItem.MatDesc;
if (string.IsNullOrEmpty(origItem.MatDesc))
{
matDescr = origItem.MatCode;
if (origItem.WMm > 0)
{
if (hasDecimal(origItem.WMm))
{
matDescr += $" {origItem.WMm:N2}";
}
else
{
matDescr += $" {origItem.WMm:N0}";
}
}
if (hasDecimal(origItem.HMm))
{
matDescr += $"x{origItem.HMm:N2}";
}
else
{
matDescr += $"x{origItem.HMm:N0}";
}
}
if (origItem != null)
{
answ = new MaterialModel()
{
MatId = origItem.MatCloudId,
MatCode = origItem.MatCode,
MatDesc = origItem.MatDesc,
MatDesc = matDescr,
LMm = origItem.LMm,
WMm = origItem.WMm,
HMm = origItem.HMm
@@ -569,7 +988,7 @@ namespace MagMan.Data.Tenant.Services
/// Update record Materiale + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem"></param>
/// <param name="currItem">Item da aggiornare/inserire</param>
/// <returns></returns>
public async Task<bool> MaterialUpdate(int nKey, MaterialModel currItem)
{
@@ -678,10 +1097,11 @@ namespace MagMan.Data.Tenant.Services
{
ProjModel answ = new ProjModel()
{
MachineID = origItem.MachineCloudId,
KeyNum = origItem.KeyNum,
ProjDbId = origItem.ProjCloudId,
ProjExtDbId = origItem.ProjLocalId,
ProjExtId = origItem.ProjExtId,
MachineID = origItem.MachineCloudId,
KeyNum = origItem.KeyNum,
BTLFileName = origItem.BTLFileName,
PType = origItem.PType,
Machine = origItem.Machine,
@@ -750,6 +1170,47 @@ namespace MagMan.Data.Tenant.Services
return dbResult;
}
/// <summary>
/// Record progetto dato cliente e Key (ID)
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="ProjCloudId">Key del record cercato (&gt;0)</param>
/// <returns></returns>
public async Task<ProjModel> ProjectGetById(int nKey, int ProjCloudId)
{
string source = "DB";
string cString = ConnString(nKey);
ProjModel dbResult = new ProjModel();
ProjModel? tempResult = null;
try
{
string currKey = $"{Const.rKeyConfig}:{nKey}:ProjRec:{ProjCloudId}";
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
string? rawData = await redisDb.StringGetAsync(currKey);
if (!string.IsNullOrEmpty(rawData))
{
source = "REDIS";
tempResult = JsonConvert.DeserializeObject<ProjModel>(rawData);
}
else
{
tempResult = dbController.ProjectGetById(cString, ProjCloudId);
rawData = JsonConvert.SerializeObject(tempResult, JSSettings);
await redisDb.StringSetAsync(currKey, rawData, LongCache);
}
dbResult = tempResult == null ? new ProjModel() : tempResult;
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ProjectGetById | {source} in: {ts.TotalMilliseconds} ms");
}
catch (Exception exc)
{
Log.Error($"Error during ProjectGetById:{Environment.NewLine}{exc}");
}
return dbResult;
}
/// <summary>
/// Lista progetti x macchina
/// </summary>
@@ -801,6 +1262,62 @@ namespace MagMan.Data.Tenant.Services
return dbResult;
}
/// <summary>
/// Elenco record progetti dato Key + data ultima modifica registrata
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="DtRif">Data rispetto cui cercare modifiche successive</param>
/// <returns></returns>
public List<ProjModel> ProjectGetModAfter(int nKey, DateTime DtRif)
{
string source = "DB";
string cString = ConnString(nKey);
List<ProjModel> dbResult = new List<ProjModel>();
try
{
// NON Usa la cache poiché voglio sync DB-DB in realtime
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
dbResult = dbController.ProjectGetModAfter(cString, DtRif);
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ProjectGetModAfter | {source} in: {ts.TotalMilliseconds} ms");
}
catch (Exception exc)
{
Log.Error($"Error during ProjectGetModAfter:{Environment.NewLine}{exc}");
}
return dbResult;
}
/// <summary>
/// Upsert record Project + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="projDbId">ID Record progetto da aggiornare</param>
/// <param name="procTime">Durata progetto (cumulata)</param>
/// <param name="valAct">Valore Progresso attuale (tipicamente num barre/pezzi)</param>
/// <param name="valMax">Valore Progresso max atteso (tipicamente num barre/pezzi)</param>
/// <returns>Bool aggiornamento</returns>
public async Task<bool> ProjectSetProgr(int nKey, int projDbId, double procTime, double valAct, double valMax)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.ProjectSetProgr(cString, projDbId, procTime, valAct, valMax);
if (fatto)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during ProjectSetProgr:{Environment.NewLine}{exc}");
}
return fatto;
}
/// <summary>
/// Converte il DTO in ItemModel
/// </summary>
@@ -834,18 +1351,18 @@ namespace MagMan.Data.Tenant.Services
}
/// <summary>
/// Update record Item + refresh cache
/// Update record Project + refresh cache x info archived
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item interesato</param>
/// <returns></returns>
public async Task<bool> ProjectUpdate(int nKey, ProjModel currItem)
/// <param name="newData">IDizionario ProdId / IsArchived da impostare</param>
/// <returns>Bool aggiornamento</returns>
public async Task<bool> ProjectUpdArchived(int nKey, Dictionary<int, bool> newData)
{
bool fatto = false;
string cString = ConnString(nKey);
try
{
fatto = dbController.ProjectUpdate(cString, currItem);
fatto = dbController.ProjectUpdArchived(cString, newData);
if (fatto)
{
await FlushRedisCache();
@@ -853,11 +1370,59 @@ namespace MagMan.Data.Tenant.Services
}
catch (Exception exc)
{
Log.Error($"Error during ProjectUpdate:{Environment.NewLine}{exc}");
Log.Error($"Error during ProjectUpdArchived:{Environment.NewLine}{exc}");
}
return fatto;
}
/// <summary>
/// Upsert record Project + refresh cache
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="currItem">Item interesato</param>
/// <returns>ID del progetto creato/aggiornato da usare come CloudId</returns>
public async Task<int> ProjectUpsert(int nKey, ProjModel currItem)
{
int prjCloudId = 0;
string cString = ConnString(nKey);
try
{
prjCloudId = dbController.ProjectUpsert(cString, currItem);
if (prjCloudId > 0)
{
await FlushRedisCache();
}
}
catch (Exception exc)
{
Log.Error($"Error during ProjectUpsert:{Environment.NewLine}{exc}");
}
return prjCloudId;
}
/// <summary>
/// Recupera ultimo record attivo ReqPlan x tipo richiesto
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="ProjCloudId">ID del progetto da cercare</param>
/// <param name="ResState">Stato richiesta da cercare</param>
/// <returns>Record cercato o default se non trovato</returns>
public RequestPlanModel ReqPlanGetLast(int nKey, int ProjCloudId, ProjResState ResState)
{
RequestPlanModel lastRec = new RequestPlanModel();
string cString = ConnString(nKey);
try
{
// cerco record (se fosse con valori "ini" p non trovata
lastRec = dbController.ReqPlanGetLast(cString, ProjCloudId, ResState);
}
catch (Exception exc)
{
Log.Error($"Error during ReqPlanGetLast:{Environment.NewLine}{exc}");
}
return lastRec;
}
/// <summary>
/// Aggiunge/Modifica un record ReqPlan
/// </summary>
@@ -1015,18 +1580,18 @@ namespace MagMan.Data.Tenant.Services
/// Aggiunge/Modifica un record Resource
/// </summary>
/// <param name="nKey">Key di riferimento</param>
/// <param name="requestPlanId">Key della richiesta di riferimento</param>
/// <param name="recList">Elenco record da aggiungere/aggiornare</param>
/// &gt;
/// <param name="resState">Tipo di aggiornamento da registratre</param>
/// <param name="userId">User corrente (SE applicabile)</param>
/// <param name="noteUid">Note / UserId (SE applicabile)</param>
/// <returns></returns>
public async Task<int> ResourceUpdate(int nKey, List<ResourceModel> recList, Enums.ProjResState resState, string userId)
public async Task<int> ResourceUpdate(int nKey, int requestPlanId, List<ResourceDTO> recList, Enums.ProjResState resState, string noteUid)
{
int newId = 0;
string cString = ConnString(nKey);
try
{
newId = dbController.ResourceUpdate(cString, recList, resState, userId);
newId = dbController.ResourceUpdate(cString, requestPlanId, recList, resState, noteUid);
if (newId > 0)
{
await FlushRedisCache();
@@ -1041,6 +1606,12 @@ namespace MagMan.Data.Tenant.Services
#endregion Public Methods
#region Protected Fields
protected static TenantController dbController = null!;
#endregion Protected Fields
#region Private Fields
private static JsonSerializerSettings? JSSettings;
@@ -1050,7 +1621,9 @@ namespace MagMan.Data.Tenant.Services
#region Private Properties
private string CodApp { get; set; } = "";
private Dictionary<int, string> ConnStringLUT { get; set; } = new Dictionary<int, string>();
private string DbServerAddr { get; set; } = "";
#endregion Private Properties
@@ -1077,7 +1650,7 @@ namespace MagMan.Data.Tenant.Services
// verifico eventuale creazione/migrazione...
DbConfig.InitDb(DbServerAddr, nKey);
// verifico se serve applicazione migrazioni
DbConfig.ExecMigrationMain();
DbConfig.ExecMigrationMain(answ);
// aggiungo a LUT
ConnStringLUT.Add(nKey, answ);
}
@@ -0,0 +1,38 @@
DROP PROCEDURE IF EXISTS `stp_mergeLogMachine`;
CREATE DEFINER=`steamware`@`10.74.%` PROCEDURE `stp_mergeLogMachine`(
IN `pKeyNum` INT,
IN `pMachineID` INT,
IN `pProjDbId` INT,
IN `pDtEvent` DATETIME,
IN `pEvType` INT,
IN `pSupervId` VARCHAR(250),
IN `pVarValue` VARCHAR(250)
)
LANGUAGE SQL
NOT DETERMINISTIC
CONTAINS SQL
SQL SECURITY DEFINER
COMMENT 'Inserimento record in table LogMachine qualora non esistesse'
BEGIN
# do x scontata cancellazione, creo nuovo record!
INSERT INTO LogMachine(KeyNum, MachineID, ProjDbId, DtEvent, EvType, SupervId, VarValue)
VALUES (pKeyNum, pMachineID, pProjDbId, pDtEvent, pEvType, pSupervId, pVarValue);
## creo record se non fosse già presente
#INSERT INTO LogMachine(KeyNum, MachineID, ProjDbId, DtEvent, EvType, SupervId, VarValue)
#SELECT src.* FROM
#(SELECT pKeyNum AS KeyNum , pMachineID AS MachineID, pProjDbId AS ProjDbId, pDtEvent AS DtEvent, pEvType AS EvType, pSupervId AS SupervId, pVarValue AS VarValue) as src
# LEFT OUTER JOIN LogMachine tgt ON
# tgt.KeyNum = src.KeyNum
# AND tgt.MachineID = src.MachineID
# AND tgt.ProjDbId = src.ProjDbId
# AND tgt.DtEvent = src.DtEvent
# AND tgt.EvType = src.EvType
# AND tgt.SupervId = src.SupervId
# AND tgt.VarValue = src.VarValue
#WHERE tgt.DbId IS NULL;
##ON DUPLICATE KEY UPDATE DbId = DbId;
END
@@ -0,0 +1,129 @@
DROP PROCEDURE IF EXISTS `stp_recalcDailyMGP`;
CREATE PROCEDURE `stp_recalcDailyMGP`(
IN `pDateStart` DATETIME,
IN `pDateEnd` DATETIME,
IN `pMachineId` INT
)
LANGUAGE SQL
NOT DETERMINISTIC
CONTAINS SQL
SQL SECURITY DEFINER
COMMENT 'Ricalcolo statistiche giornaliere x MachGroup + Part da LogMachine'
BEGIN
# Elimino dati eventualmente presenti nel periodo indicato
DELETE
FROM PartList
WHERE (DtStart >= pDateStart AND DtStart < pDateEnd)
OR (DtEnd >= pDateStart AND DtEnd < pDateEnd);
DELETE
FROM MachGroupList
WHERE (DtStart >= pDateStart AND DtStart < pDateEnd)
OR (DtEnd >= pDateStart AND DtEnd < pDateEnd);
DELETE
FROM DayStat
WHERE DtRif>= pDateStart AND dtRif < pDateEnd;
# creo record MachGroup con inizio e fine
INSERT INTO MachGroupList(MachGroupId, ProjDbId, DtStart, DtEnd)
SELECT tab_s.MachGroupId, tab_s.ProjDbId, tab_s.DtStart, tab_e.DtEnd
FROM
(
SELECT *
,@rownum := IF(GroupKey = @prev_col1, @rownum + 1, 1) AS numriga
,@prev_col1 := GroupKey
FROM
(
SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-2),';',1) AS INT) AS MachGroupId
, SUBSTRING_INDEX(VarValue, ';',-2) AS GroupKey
, ProjDbId
, DtEvent AS DtStart
FROM LogMachine
WHERE MachineID = pMachineId
AND (DtEvent >= pDateStart AND DtEvent < pDateEnd)
AND EvType = 2
AND RIGHT(VarValue,1) = 1
) t , (SELECT @rownum := 0, @prev_col1 := NULL) r
ORDER BY GroupKey
) as tab_s
JOIN
(
SELECT *
,@rownum := IF(GroupKey = @prev_col1, @rownum + 1, 1) AS numriga
,@prev_col1 := GroupKey
FROM
(
SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-2),';',1) AS INT) AS MachGroupId
, SUBSTRING_INDEX(VarValue, ';',-2) AS GroupKey
, ProjDbId
, DtEvent AS DtEnd
FROM LogMachine
WHERE MachineID = pMachineId
AND (DtEvent >= pDateStart AND DtEvent < pDateEnd)
AND EvType = 2
AND RIGHT(VarValue,1) = 2
) t , (SELECT @rownum := 0, @prev_col1 := NULL) r
ORDER BY GroupKey
) AS tab_e
ON tab_s.MachGroupId = tab_e.MachGroupId AND tab_s.ProjDbId = tab_e.ProjDbId AND tab_s.numriga = tab_e.numriga;
# creo record Part con inizio e fine
INSERT INTO PartList(PartId, MachGroupId, ProjDbId, DtStart, DtEnd)
SELECT tab_s.Id, tab_s.MachGroupId, tab_s.ProjDbId, tab_s.DtStart, tab_e.DtEnd
FROM
(
SELECT *
,@rownum := IF(GroupKey = @prev_col1, @rownum + 1, 1) AS numriga
,@prev_col1 := GroupKey
FROM
(
SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-2),';',1) AS INT) AS Id
, CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-3),';',1) AS INT) AS MachGroupId
, SUBSTRING_INDEX(VarValue, ';',-3) AS GroupKey
, ProjDbId
, DtEvent AS DtStart
FROM LogMachine
WHERE MachineID = pMachineId
AND (DtEvent >= pDateStart AND DtEvent < pDateEnd)
AND EvType = 1
AND RIGHT(VarValue,1) = 1
) t , (SELECT @rownum := 0, @prev_col1 := NULL) r
ORDER BY GroupKey
) as tab_s
JOIN
(
SELECT *
,@rownum := IF(GroupKey = @prev_col1, @rownum + 1, 1) AS numriga
,@prev_col1 := GroupKey
FROM
(
SELECT CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-2),';',1) AS INT) AS Id
, CAST(SUBSTRING_INDEX(SUBSTRING_INDEX(VarValue, ';',-3),';',1) AS INT) AS MachGroupId
, SUBSTRING_INDEX(VarValue, ';',-3) AS GroupKey
, ProjDbId
, DtEvent AS DtEnd
FROM LogMachine
WHERE MachineID = pMachineId
AND (DtEvent >= pDateStart AND DtEvent < pDateEnd)
AND EvType = 1
AND RIGHT(VarValue,1) = 2
) t , (SELECT @rownum := 0, @prev_col1 := NULL) r
ORDER BY GroupKey
) AS tab_e
ON tab_s.id = tab_e.id AND tab_s.MachGroupId = tab_e.MachGroupId AND tab_s.ProjDbId = tab_e.ProjDbId AND tab_s.numriga = tab_e.numriga;
# per giancarlo: verificare la procedura che crei correttamente part e machGroup, controllando che le date siano coerenti (eventi inizio/fine sequenziali), lasciando eventualmente fuori i dati "incompleti"; verificare con EMmanuele se evento inizio da prendere sia "il primo o il precedente" considerato che POTREMMO avere + record inizio che fine
#SELECT *
#FROM MachGroupList;
#SELECT *
#FROM PartList;
END;
@@ -0,0 +1,22 @@
DROP PROCEDURE IF EXISTS `stp_removeLogMachine`;
CREATE DEFINER=`steamware`@`10.74.%` PROCEDURE `stp_removeLogMachine`(
IN `pKeyNum` INT,
IN `pMachineID` INT,
IN `pDtMin` DATETIME,
IN `pDtMax` DATETIME
)
LANGUAGE SQL
NOT DETERMINISTIC
CONTAINS SQL
SQL SECURITY DEFINER
COMMENT 'Rimozione in blocco record da Key+Macchina+Periodo table LogMachine'
BEGIN
# elimino intervallo
DELETE
FROM LogMachine
WHERE KeyNum = pKeyNum
AND MachineID = pMachineID
AND (DtEvent >= pDtMin AND DtEvent <= pDtMax);
END
@@ -1,26 +1,71 @@
@page
@model ForgotPasswordModel
@{
ViewData["Title"] = "Forgot your password?";
ViewData["Title"] = "Password dimenticata?";
}
<h1>@ViewData["Title"]</h1>
<h2>Enter your email.</h2>
<hr />
<div class="row">
<div class="col-md-4">
<form method="post">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating">
<input asp-for="Input.Email" class="form-control" autocomplete="username" aria-required="true" />
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<button type="submit" class="w-100 btn btn-lg btn-primary">Reset Password</button>
</form>
</div>
<div class="d-flex justify-content-center">
<h1>@ViewData["Title"]</h1>
</div>
<div style="
display: flex;
justify-content: center;
">
<div class="row p-3 w-100" style="border-radius: 2rem; min-height:500px; height: auto; box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;">
<div class="col py-3 d-flex justify-content-center align-content-center flex-wrap">
<div>
<div class="d-flex justify-content-center fw-bold fs-2">
EgtBeam&Wall
</div>
<div class="d-flex justify-content-center mb-4">
Powered by
</div>
<div class="d-flex justify-content-center">
<img src="~/images/LogoEgw.png" style="height: 10rem; width: 10rem;" />
</div>
<div class="d-flex justify-content-center fw-bold fs-3">
EgalWare
</div>
</div>
</div>
<div class="col" style="border-radius: 2rem; background-color: #f3f3f8; box-shadow: rgba(62, 39, 35, 0.2) 0px 8px 24px;">
<div class="cardRightHeader"></div>
<div class="row">
<div class="py-3 px-5 d-flex justify-content-center align-content-center2 flex-wrap">
<form method="post" class="w-100">
<h2>Inserisci email.</h2>
<hr />
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating mb-2">
<input asp-for="Input.Email" class="form-control" autocomplete="username" aria-required="true" />
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<div class="mb-4">
<button type="submit" class="w-100 btn btn-lg btn-dark">Reset Password</button>
</div>
<div>
<p>
<a id="already-register" asp-page="./Login" class="text-decoration-none text-dark">Hai già un profilo? <b>Clicca qui</b></a>
</p>
<p>
<a asp-page="./Register" class="text-decoration-none text-dark">Registra <b>nuovo utente</b></a>
</p>
<p>
<a id="resend-confirmation" asp-page="./ResendEmailConfirmation" class="text-decoration-none text-dark"><b>Reinvia email</b> di conferma</a>
</p>
</div>
</form>
</div>
</div>
</div>
</div>
</div>
@section Scripts {
<partial name="_ValidationScriptsPartial" />
}
@@ -2,83 +2,75 @@
@model LoginModel
@{
ViewData["Title"] = "Log in";
ViewData["Title"] = "MagMan";
}
<div class="row shadow">
<h1>@ViewData["Title"]</h1>
<div class="offset-3 col-md-6">
<section>
<form id="account" method="post">
<h2>Use a local account to log in.</h2>
<hr />
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating">
<input asp-for="Input.Email" class="form-control" autocomplete="username" aria-required="true" />
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
<div class="d-flex justify-content-center">
<h1>@ViewData["Title"]</h1>
</div>
<div style="display: flex; justify-content: center;">
<div class="row p-3 w-100" style="border-radius: 2rem; min-height:500px; height: auto; box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;">
<div class="col py-3 d-flex justify-content-center align-content-center flex-wrap">
<div>
<div class="d-flex justify-content-center fw-bold fs-2">
EgtBeam&Wall
</div>
<div class="form-floating">
<input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
<label asp-for="Input.Password" class="form-label"></label>
<span asp-validation-for="Input.Password" class="text-danger"></span>
<div class="d-flex justify-content-center mb-4">
Powered by
</div>
<div>
<div class="checkbox">
<label asp-for="Input.RememberMe" class="form-label">
<input class="form-check-input" asp-for="Input.RememberMe" />
@Html.DisplayNameFor(m => m.Input.RememberMe)
</label>
</div>
<div class="d-flex justify-content-center">
<img src="~/images/LogoEgw.png" style="height: 10rem; width: 10rem;" />
</div>
<div>
<button id="login-submit" type="submit" class="w-100 btn btn-lg btn-primary">Log in</button>
<div class="d-flex justify-content-center fw-bold fs-3">
EgalWare
</div>
<hr />
<div>
<p>
<a id="forgot-password" asp-page="./ForgotPassword">Forgot your password?</a>
</p>
<p>
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl">Register as a new user</a>
</p>
<p>
<a id="resend-confirmation" asp-page="./ResendEmailConfirmation">Resend email confirmation</a>
</p>
</div>
</form>
</section>
</div>
@* <div class="col-md-6 col-md-offset-2">
<section>
<h3>Use another service to log in.</h3>
<hr />
@{
if ((Model.ExternalLogins?.Count ?? 0) == 0)
{
<div>
<p>
There are no external authentication services configured. See this <a href="https://go.microsoft.com/fwlink/?LinkID=532715">article
about setting up this ASP.NET application to support logging in via external services</a>.
</p>
</div>
}
else
{
<form id="external-account" asp-page="./ExternalLogin" asp-route-returnUrl="@Model.ReturnUrl" method="post" class="form-horizontal">
</div>
</div>
<div class="col" style="border-radius: 2rem; background-color: #f3f3f8;box-shadow: rgba(41, 128, 185, 0.2) 0px 8px 24px;">
<div class="cardRightHeader"></div>
<div class="row">
<div class="py-3 px-5 d-flex justify-content-center align-content-center flex-wrap">
<form id="account" method="post" class="w-100">
<h2 class="text-dark">Login Utente</h2>
<hr />
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating mb-1">
<input asp-for="Input.Email" class="form-control" autocomplete="username" aria-required="true" />
<label asp-for="Input.Email" class="form-label"></label>
<span asp-validation-for="Input.Email" class="text-danger"></span>
</div>
<div class="form-floating mb-1">
<input asp-for="Input.Password" class="form-control" autocomplete="current-password" aria-required="true" />
<label asp-for="Input.Password" class="form-label"></label>
<span asp-validation-for="Input.Password" class="text-danger"></span>
</div>
<div>
<div class="checkbox text-dark text-start">
<label asp-for="Input.RememberMe" class="form-label">
<input class="form-check-input" asp-for="Input.RememberMe" />
@Html.DisplayNameFor(m => m.Input.RememberMe)
</label>
</div>
</div>
<div class="mb-4">
<button id="login-submit" type="submit" class="w-100 btn btn-lg btn-dark">Log in</button>
</div>
<div>
<p>
@foreach (var provider in Model.ExternalLogins!)
{
<button type="submit" class="btn btn-primary" name="provider" value="@provider.Name" title="Log in using your @provider.DisplayName account">@provider.DisplayName</button>
}
<a id="forgot-password" asp-page="./ForgotPassword" class="text-decoration-none text-dark">Password <b>dimenticata</b>?</a>
</p>
<p>
<a asp-page="./Register" asp-route-returnUrl="@Model.ReturnUrl" class="text-decoration-none text-dark">Registra <b>nuovo utente</b></a>
</p>
<p>
<a id="resend-confirmation" asp-page="./ResendEmailConfirmation" class="text-decoration-none text-dark"><b>Reinvia email</b> di conferma</a>
</p>
</div>
</form>
}
}
</section>
</div> *@
</div>
</div>
</div>
</div>
</div>
@section Scripts {
@@ -92,6 +92,11 @@ namespace MagMan.UI.Areas.Identity.Pages.Account
public async Task<IActionResult> OnPostAsync(string returnUrl = null)
{
returnUrl ??= Url.Content("~/");
// se fosse logout --> rimanda a home!
if(returnUrl.Contains("Logout"))
{
returnUrl = Url.Content("~/");
}
ExternalLogins = (await _signInManager.GetExternalAuthenticationSchemesAsync()).ToList();
@@ -160,7 +165,7 @@ namespace MagMan.UI.Areas.Identity.Pages.Account
/// intended to be used directly from your code. This API may change or be removed in
/// future releases.
/// </summary>
[Display(Name = "Remember me?")]
[Display(Name = "Ricordami")]
public bool RememberMe { get; set; }
#endregion Public Properties
@@ -8,7 +8,7 @@
<h3>@ViewData["Title"]</h3>
<partial name="_StatusMessage" for="StatusMessage" />
<div class="row">
<div class="col-md-6">
<div class="col-12">
<form id="change-password-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating">
@@ -8,7 +8,7 @@
<h3>@ViewData["Title"]</h3>
<partial name="_StatusMessage" for="StatusMessage" />
<div class="row">
<div class="col-md-6">
<div class="col-12">
<form id="email-form" method="post">
<div asp-validation-summary="All" class="text-danger"></div>
@if (Model.IsEmailConfirmed)
@@ -8,7 +8,7 @@
<h3>@ViewData["Title"]</h3>
<partial name="_StatusMessage" for="StatusMessage" />
<div class="row">
<div class="col-md-6">
<div class="col-12">
<form id="profile-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating">
@@ -20,7 +20,7 @@
<label asp-for="Input.PhoneNumber" class="form-label"></label>
<span asp-validation-for="Input.PhoneNumber" class="text-danger"></span>
</div>
<button id="update-profile-button" type="submit" class="w-100 btn btn-lg btn-primary">Save</button>
<button id="update-profile-button" type="submit" class="w-100 btn btn-lg btn-primary">Salva</button>
</form>
</div>
</div>
@@ -8,16 +8,17 @@
<h3>@ViewData["Title"]</h3>
<div class="row">
<div class="col-md-6">
<div class="col-12">
<p>Your account contains personal data that you have given us. This page allows you to download or delete that data.</p>
<p>
<form id="download-data" asp-page="DownloadPersonalData" method="post">
<button class="btn btn-primary w-100" type="submit">Download</button>
</form>
<hr />
<p class="mt-5">
<strong>Deleting this data will permanently remove your account, and this cannot be recovered.</strong>
</p>
<form id="download-data" asp-page="DownloadPersonalData" method="post">
<button class="btn btn-primary" type="submit">Download</button>
</form>
<p>
<a id="delete" asp-page="DeletePersonalData" class="btn btn-danger">Delete</a>
<a id="delete" asp-page="DeletePersonalData" class="btn btn-danger w-100">Delete</a>
</p>
</div>
</div>
@@ -12,7 +12,7 @@
account so you can log in without an external login.
</p>
<div class="row">
<div class="col-md-6">
<div class="col-12">
<form id="set-password-form" method="post">
<div asp-validation-summary="ModelOnly" class="text-danger"></div>
<div class="form-floating">
@@ -1,5 +1,5 @@
@{
if (ViewData.TryGetValue("ParentLayout", out var parentLayout) && parentLayout != null)
if (ViewData.TryGetValue("ParentLayout", out var parentLayout) && parentLayout != null)
{
Layout = parentLayout.ToString();
}
@@ -9,21 +9,41 @@
}
}
<h1>Manage your account</h1>
<div>
<h2>Change your account settings</h2>
<hr />
<div class="row">
<div class="col-md-3">
<partial name="_ManageNav" />
<div class="d-flex justify-content-center">
<h1>Gestione account</h1>
<h5></h5>
</div>
<div style="display: flex; justify-content: center;" class="w-100">
<div class="row p-3 w-100" style="border-radius: 2rem; min-height:500px; height: auto; box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;">
<div class="col-4 py-3 d-flex justify-content-center align-content-center flex-wrap">
<div>
<div class="d-flex justify-content-center fw-bold fs-2">
EgtBeam&Wall
</div>
<partial name="_ManageNav" />
<hr />
<div class="d-flex justify-content-center mb-4">
Powered by
</div>
<div class="d-flex justify-content-center">
<img src="~/images/LogoEgw.png" style="height: 10rem; width: 10rem;" />
</div>
<div class="d-flex justify-content-center fw-bold fs-3">
EgalWare
</div>
</div>
</div>
<div class="col-md-9">
@RenderBody()
<div class="col-8" style="border-radius: 2rem; background-color: #f3f3f8;box-shadow: rgba(41, 128, 185, 0.2) 0px 8px 24px;">
<div class="cardRightHeader"></div>
<div class="row">
<div class="py-3 px-5 w-100">
@RenderBody()
</div>
</div>
</div>
</div>
</div>
@section Scripts {
@RenderSection("Scripts", required: false)
}
}

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