diff --git a/.vs/config/applicationhost.config b/.vs/config/applicationhost.config index 4c1a361d..45d32f0f 100644 --- a/.vs/config/applicationhost.config +++ b/.vs/config/applicationhost.config @@ -170,7 +170,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -186,7 +186,7 @@ - + @@ -202,7 +202,7 @@ - + @@ -226,7 +226,7 @@ - + @@ -234,7 +234,7 @@ - + diff --git a/Jenkinsfile b/Jenkinsfile index c095cfad..97147b67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=707']) { + withEnv(['NEXT_BUILD_NUMBER=708']) { // env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' diff --git a/MP-Tablet/Files/Disegni/ND.pdf b/MP-Tablet/Files/Disegni/ND.pdf new file mode 100644 index 00000000..22c7eb5c Binary files /dev/null and b/MP-Tablet/Files/Disegni/ND.pdf differ diff --git a/MP-Tablet/Files/Disegni/PlaceHolder.file b/MP-Tablet/Files/Disegni/PlaceHolder.file new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/MP-Tablet/Files/Disegni/PlaceHolder.file @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 72155f08..f656da2c 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -370,6 +370,13 @@ + + + Always + + + Always + Designer @@ -948,7 +955,9 @@ - + + Always + diff --git a/MP-Tablet/Resources/Disegni/ND.docx b/MP-Tablet/Resources/Disegni/ND.docx new file mode 100644 index 00000000..da28f056 Binary files /dev/null and b/MP-Tablet/Resources/Disegni/ND.docx differ diff --git a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx index 6303a7da..6b02c741 100644 --- a/MP-Tablet/WebUserControls/mod_dettMacchina.ascx +++ b/MP-Tablet/WebUserControls/mod_dettMacchina.ascx @@ -5,7 +5,7 @@
-
+
@@ -44,6 +44,11 @@
+
+ +
DIS.
+
+
diff --git a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx index ae7fa52e..4ddf1cc2 100644 --- a/MP-Tablet/WebUserControls/mod_elencoControlli.ascx +++ b/MP-Tablet/WebUserControls/mod_elencoControlli.ascx @@ -6,7 +6,7 @@ - +