diff --git a/.vs/MAPO.sqlite b/.vs/MAPO.sqlite index 1f806ca8..834b9037 100644 Binary files a/.vs/MAPO.sqlite and b/.vs/MAPO.sqlite differ diff --git a/MP-Site/MP-Site.csproj b/MP-Site/MP-Site.csproj index bae9cb8d..28af9806 100644 --- a/MP-Site/MP-Site.csproj +++ b/MP-Site/MP-Site.csproj @@ -607,7 +607,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -743,6 +775,7 @@ + Web.config @@ -777,6 +810,9 @@ --> + + "$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)" + diff --git a/MP-Site/Resources/Donati/macchine/Combi_A.jpg b/MP-Site/Resources/Donati/macchine/Combi_A.jpg new file mode 100644 index 00000000..4150531d Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Combi_A.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Combi_B.jpg b/MP-Site/Resources/Donati/macchine/Combi_B.jpg new file mode 100644 index 00000000..ccc94c0c Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Combi_B.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Combi_C.jpg b/MP-Site/Resources/Donati/macchine/Combi_C.jpg new file mode 100644 index 00000000..c5c6b517 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Combi_C.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/DMG_1035v.jpg b/MP-Site/Resources/Donati/macchine/DMG_1035v.jpg new file mode 100644 index 00000000..19503010 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/DMG_1035v.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Doosan_HP5100II.jpg b/MP-Site/Resources/Donati/macchine/Doosan_HP5100II.jpg new file mode 100644 index 00000000..6a12fda7 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Doosan_HP5100II.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Linearmill_600.jpg b/MP-Site/Resources/Donati/macchine/Linearmill_600.jpg new file mode 100644 index 00000000..f59d8486 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Linearmill_600.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Maxxmill_500.jpg b/MP-Site/Resources/Donati/macchine/Maxxmill_500.jpg new file mode 100644 index 00000000..9126bbfa Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Maxxmill_500.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Nikkei.jpg b/MP-Site/Resources/Donati/macchine/Nikkei.jpg new file mode 100644 index 00000000..4ee5effd Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Nikkei.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Riello1.jpg b/MP-Site/Resources/Donati/macchine/Riello1.jpg new file mode 100644 index 00000000..2ad905dc Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Riello1.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Riello2.jpg b/MP-Site/Resources/Donati/macchine/Riello2.jpg new file mode 100644 index 00000000..2e2f586b Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Riello2.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Thumbs.db b/MP-Site/Resources/Donati/macchine/Thumbs.db new file mode 100644 index 00000000..e11fb7b8 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Thumbs.db differ diff --git a/MP-Site/Resources/Donati/macchine/Transfer_BTB.jpg b/MP-Site/Resources/Donati/macchine/Transfer_BTB.jpg new file mode 100644 index 00000000..5df7f428 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Transfer_BTB.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg b/MP-Site/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg new file mode 100644 index 00000000..60c9fee6 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/cosmap.jpg b/MP-Site/Resources/Donati/macchine/cosmap.jpg new file mode 100644 index 00000000..ad72da48 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/cosmap.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/exAbb.jpg b/MP-Site/Resources/Donati/macchine/exAbb.jpg new file mode 100644 index 00000000..659a09ae Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/exAbb.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/pul001.jpg b/MP-Site/Resources/Donati/macchine/pul001.jpg new file mode 100644 index 00000000..e96c97e2 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/pul001.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/pul002.jpg b/MP-Site/Resources/Donati/macchine/pul002.jpg new file mode 100644 index 00000000..e6248fe3 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/pul002.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/pul003.jpg b/MP-Site/Resources/Donati/macchine/pul003.jpg new file mode 100644 index 00000000..15f4ecb7 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/pul003.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/pul004.jpg b/MP-Site/Resources/Donati/macchine/pul004.jpg new file mode 100644 index 00000000..6c224c76 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/pul004.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sbav005.jpg b/MP-Site/Resources/Donati/macchine/sbav005.jpg new file mode 100644 index 00000000..6aaacb7b Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sbav005.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme001.jpg b/MP-Site/Resources/Donati/macchine/sme001.jpg new file mode 100644 index 00000000..dbafaf78 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme001.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme002.jpg b/MP-Site/Resources/Donati/macchine/sme002.jpg new file mode 100644 index 00000000..6ca2a18d Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme002.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme003.jpg b/MP-Site/Resources/Donati/macchine/sme003.jpg new file mode 100644 index 00000000..dcb029ee Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme003.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme004.jpg b/MP-Site/Resources/Donati/macchine/sme004.jpg new file mode 100644 index 00000000..0de0a909 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme004.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme006.jpg b/MP-Site/Resources/Donati/macchine/sme006.jpg new file mode 100644 index 00000000..9a6db3b0 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme006.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme007.jpg b/MP-Site/Resources/Donati/macchine/sme007.jpg new file mode 100644 index 00000000..e3dcd3fb Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme007.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme008.jpg b/MP-Site/Resources/Donati/macchine/sme008.jpg new file mode 100644 index 00000000..4142c3a7 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme008.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme009.jpg b/MP-Site/Resources/Donati/macchine/sme009.jpg new file mode 100644 index 00000000..f1b43389 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme009.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme010.jpg b/MP-Site/Resources/Donati/macchine/sme010.jpg new file mode 100644 index 00000000..34e564d7 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme010.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/sme011.jpg b/MP-Site/Resources/Donati/macchine/sme011.jpg new file mode 100644 index 00000000..51667bfa Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/sme011.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/tav001.jpg b/MP-Site/Resources/Donati/macchine/tav001.jpg new file mode 100644 index 00000000..68a2dc7b Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/tav001.jpg differ diff --git a/MP-Site/Resources/Donati/macchine/tav002.jpg b/MP-Site/Resources/Donati/macchine/tav002.jpg new file mode 100644 index 00000000..72c189c0 Binary files /dev/null and b/MP-Site/Resources/Donati/macchine/tav002.jpg differ diff --git a/MP-Site/setupTgt.bat b/MP-Site/setupTgt.bat new file mode 100644 index 00000000..8662ad60 --- /dev/null +++ b/MP-Site/setupTgt.bat @@ -0,0 +1,28 @@ +@echo off +echo Effettua setup dei file specifici per ambienti cliente pre build installer: verifica da nome configurazione %1 + +REM INIZIO eliminando i files che COMUNQUE devo copiare x target... + +if %1 == "Release" goto Release +if %1 == "Debug" goto Debug +if %1 == "DONATI" goto DONATI + +:Release +echo Release: nulla da copiare +goto END + +:Debug +echo Debug: copia file ini x simulazione ESA +del %2"DATA\CONF\EsaKvara.ini" +copy %2"Resources\SCM\EsaKvara_SIM.ini" %2"DATA\CONF\EsaKvara.ini" +goto END + +:DONATI +echo DONATI: copio files DONATI +del /F /Q %2"images\macchine\*.*" +REM del /F /Q %2"DATA\CONF\*.*" +copy %2"Resources\Donati\macchine\*.*" %2"images\macchine\" +goto END + +:END +echo Fatto! \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 14e3bfae..9c410f0e 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -333,8 +333,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -396,6 +428,7 @@ + Web.config @@ -768,6 +801,9 @@ --> + + "$(ProjectDir)setupTgt.bat" "$(ConfigurationName)" "$(ProjectDir)" + diff --git a/MP-Tablet/Resources/Donati/macchine/Combi_A.jpg b/MP-Tablet/Resources/Donati/macchine/Combi_A.jpg new file mode 100644 index 00000000..4150531d Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Combi_A.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Combi_B.jpg b/MP-Tablet/Resources/Donati/macchine/Combi_B.jpg new file mode 100644 index 00000000..ccc94c0c Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Combi_B.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Combi_C.jpg b/MP-Tablet/Resources/Donati/macchine/Combi_C.jpg new file mode 100644 index 00000000..c5c6b517 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Combi_C.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/DMG_1035v.jpg b/MP-Tablet/Resources/Donati/macchine/DMG_1035v.jpg new file mode 100644 index 00000000..19503010 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/DMG_1035v.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Doosan_HP5100II.jpg b/MP-Tablet/Resources/Donati/macchine/Doosan_HP5100II.jpg new file mode 100644 index 00000000..6a12fda7 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Doosan_HP5100II.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Linearmill_600.jpg b/MP-Tablet/Resources/Donati/macchine/Linearmill_600.jpg new file mode 100644 index 00000000..f59d8486 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Linearmill_600.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Maxxmill_500.jpg b/MP-Tablet/Resources/Donati/macchine/Maxxmill_500.jpg new file mode 100644 index 00000000..9126bbfa Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Maxxmill_500.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Nikkei.jpg b/MP-Tablet/Resources/Donati/macchine/Nikkei.jpg new file mode 100644 index 00000000..4ee5effd Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Nikkei.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Riello1.jpg b/MP-Tablet/Resources/Donati/macchine/Riello1.jpg new file mode 100644 index 00000000..2ad905dc Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Riello1.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Riello2.jpg b/MP-Tablet/Resources/Donati/macchine/Riello2.jpg new file mode 100644 index 00000000..2e2f586b Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Riello2.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Thumbs.db b/MP-Tablet/Resources/Donati/macchine/Thumbs.db new file mode 100644 index 00000000..e11fb7b8 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Thumbs.db differ diff --git a/MP-Tablet/Resources/Donati/macchine/Transfer_BTB.jpg b/MP-Tablet/Resources/Donati/macchine/Transfer_BTB.jpg new file mode 100644 index 00000000..5df7f428 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Transfer_BTB.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg b/MP-Tablet/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg new file mode 100644 index 00000000..60c9fee6 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/Transfer_Tecnotransfer.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/cosmap.jpg b/MP-Tablet/Resources/Donati/macchine/cosmap.jpg new file mode 100644 index 00000000..ad72da48 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/cosmap.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/exAbb.jpg b/MP-Tablet/Resources/Donati/macchine/exAbb.jpg new file mode 100644 index 00000000..659a09ae Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/exAbb.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/pul001.jpg b/MP-Tablet/Resources/Donati/macchine/pul001.jpg new file mode 100644 index 00000000..e96c97e2 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/pul001.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/pul002.jpg b/MP-Tablet/Resources/Donati/macchine/pul002.jpg new file mode 100644 index 00000000..e6248fe3 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/pul002.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/pul003.jpg b/MP-Tablet/Resources/Donati/macchine/pul003.jpg new file mode 100644 index 00000000..15f4ecb7 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/pul003.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/pul004.jpg b/MP-Tablet/Resources/Donati/macchine/pul004.jpg new file mode 100644 index 00000000..6c224c76 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/pul004.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sbav005.jpg b/MP-Tablet/Resources/Donati/macchine/sbav005.jpg new file mode 100644 index 00000000..6aaacb7b Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sbav005.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme001.jpg b/MP-Tablet/Resources/Donati/macchine/sme001.jpg new file mode 100644 index 00000000..dbafaf78 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme001.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme002.jpg b/MP-Tablet/Resources/Donati/macchine/sme002.jpg new file mode 100644 index 00000000..6ca2a18d Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme002.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme003.jpg b/MP-Tablet/Resources/Donati/macchine/sme003.jpg new file mode 100644 index 00000000..dcb029ee Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme003.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme004.jpg b/MP-Tablet/Resources/Donati/macchine/sme004.jpg new file mode 100644 index 00000000..0de0a909 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme004.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme006.jpg b/MP-Tablet/Resources/Donati/macchine/sme006.jpg new file mode 100644 index 00000000..9a6db3b0 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme006.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme007.jpg b/MP-Tablet/Resources/Donati/macchine/sme007.jpg new file mode 100644 index 00000000..e3dcd3fb Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme007.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme008.jpg b/MP-Tablet/Resources/Donati/macchine/sme008.jpg new file mode 100644 index 00000000..4142c3a7 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme008.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme009.jpg b/MP-Tablet/Resources/Donati/macchine/sme009.jpg new file mode 100644 index 00000000..f1b43389 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme009.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme010.jpg b/MP-Tablet/Resources/Donati/macchine/sme010.jpg new file mode 100644 index 00000000..34e564d7 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme010.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/sme011.jpg b/MP-Tablet/Resources/Donati/macchine/sme011.jpg new file mode 100644 index 00000000..51667bfa Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/sme011.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/tav001.jpg b/MP-Tablet/Resources/Donati/macchine/tav001.jpg new file mode 100644 index 00000000..68a2dc7b Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/tav001.jpg differ diff --git a/MP-Tablet/Resources/Donati/macchine/tav002.jpg b/MP-Tablet/Resources/Donati/macchine/tav002.jpg new file mode 100644 index 00000000..72c189c0 Binary files /dev/null and b/MP-Tablet/Resources/Donati/macchine/tav002.jpg differ diff --git a/MP-Tablet/setupTgt.bat b/MP-Tablet/setupTgt.bat new file mode 100644 index 00000000..8662ad60 --- /dev/null +++ b/MP-Tablet/setupTgt.bat @@ -0,0 +1,28 @@ +@echo off +echo Effettua setup dei file specifici per ambienti cliente pre build installer: verifica da nome configurazione %1 + +REM INIZIO eliminando i files che COMUNQUE devo copiare x target... + +if %1 == "Release" goto Release +if %1 == "Debug" goto Debug +if %1 == "DONATI" goto DONATI + +:Release +echo Release: nulla da copiare +goto END + +:Debug +echo Debug: copia file ini x simulazione ESA +del %2"DATA\CONF\EsaKvara.ini" +copy %2"Resources\SCM\EsaKvara_SIM.ini" %2"DATA\CONF\EsaKvara.ini" +goto END + +:DONATI +echo DONATI: copio files DONATI +del /F /Q %2"images\macchine\*.*" +REM del /F /Q %2"DATA\CONF\*.*" +copy %2"Resources\Donati\macchine\*.*" %2"images\macchine\" +goto END + +:END +echo Fatto! \ No newline at end of file