diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index 4f429a7..eebd522 100644 Binary files a/.vs/MedAP/v15/.suo and b/.vs/MedAP/v15/.suo differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide b/.vs/MedAP/v15/Server/sqlite3/storage.ide index f42804a..889dc16 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide and b/.vs/MedAP/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide-shm b/.vs/MedAP/v15/Server/sqlite3/storage.ide-shm index 66ba9ff..e648a75 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide-shm and b/.vs/MedAP/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal index a3d8710..fb5ce09 100644 Binary files a/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal and b/.vs/MedAP/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Jenkinsfile b/Jenkinsfile index 37ca201..b2773e0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=114']) { + withEnv(['NEXT_BUILD_NUMBER=115']) { // env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2017-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2017-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MedAP' diff --git a/MedAP/WebUserControl/mod_DocsArchive.ascx b/MedAP/WebUserControl/mod_DocsArchive.ascx index 295e2e5..b3b6635 100644 --- a/MedAP/WebUserControl/mod_DocsArchive.ascx +++ b/MedAP/WebUserControl/mod_DocsArchive.ascx @@ -15,6 +15,13 @@ // printWindow.print(); // printWindow.close(); //} + function PreviewUrl(idxDoc) { + var actPath = document.URL; + actPath = actPath.replace('DocArchive', 'Print') + '?tipoDoc=FATT&idxDoc=' + idxDoc; + //var printWindow = window.open(actPath.replace('PREN', 'PREN_Print'), '_blank', 'height=600,width=800'); + var printWindow = window.open(actPath, '_blank '); + return false; + } function PrintUrl(idxDoc) { var actPath = document.URL; actPath = actPath.replace('DocArchive', 'Print') + '?tipoDoc=FATT&idxDoc=' + idxDoc; @@ -40,8 +47,11 @@ / -
-
+
+
+ + + @@ -58,20 +68,33 @@ - + + + + + + + + - + + + + +
-
+ +
+ +
-