From 894f7e3fcc465a2cdb2433c673d939cf10dab455 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 25 Jan 2018 16:19:50 +0100 Subject: [PATCH] altri fix grafici --- .vs/MedAP/v15/.suo | Bin 207872 -> 198144 bytes Jenkinsfile | 2 +- MedAP/DocArchive.aspx | 4 ++-- MedAP/Web.config | 1 + MedAP/WebUserControl/mod_testata.ascx | 4 ++-- MedAP/WebUserControl/mod_testata.ascx.cs | 6 ++++-- MedAP/bin/Web.config | 1 + 7 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.vs/MedAP/v15/.suo b/.vs/MedAP/v15/.suo index ff58990f3ad46fdb24318d04603083ea289d0169..bce7c5d28e9864ba638c416b1a2e1b22c7789c5c 100644 GIT binary patch delta 4947 zcmd5<4^)&@7XR-3hGFD2jx*mj73`3v*|0~mIM9Q`} zFL@qw_t?}K&22q6pUY=!wxiW%#`>q)YCEoS%+S+G#Y7kXBzqsuc-YL^+RmQ+IKR2~ z-S^&o_j~vL-uJM58fwZ4|wGU@^2=6gtwhU?HtneB*pwbr1vM(vfa9fT47mE zJrlj7MO!?hsV!c$!fP+_$_B5OXT4I4ji@dPSTG^Luv6_b3BH3pM{RqBf z=l3Lg3|Xeo2$5{DTbYEx1Yfd6>^f=-8Ax(IjU7p{kfiTjdMA4}*^3Ci9lb?Z;{&YJ>Zb(;n8+2zT%VV26SqWYr-J%ob&4 zX1(+7MWd==pi&dHA;4jtqmQQPB3d6Ju&8K1&TDpCh@Ruz{dFn49a} zuT_)RImc_8z5-nz*&B?OBu(h{Cpno7D2NLW_gW&nGLlU$_`FznO(t(s$(l!)MhK<$ zbdrw}L~?x3FR3l`Z0i3N=?|0i_06TWf!dFG$J|GH7U5}De7NsMo0WYvBa(ak!FY^(9dGuZ9Aq!~MGWX5Z5$zqFoDoXxI(x}_$T}O z$_E^dLmF{FiGVsCQv+ZbH3ZXpB4iERaTN2Eyt?Lqu=xv0ifhWM=T}(Qo?-oUb9rp;*S7 z|AsM2-770(cDi{8^SmC-%O=1<)}}$=woREqL1?fbmT_qy#@&`B-&Nqw z%}8`)CdZENt+L*=H8MNf+EZK33tDDx&*Y}5kgJCFhcr|@8nDQBD#=v_da5RtygO2T zegP!Q+}IZms=8R{>ff>xsPv`|4dInVkjolw7}X^?upWM7t?9Tu4j$)Q*FvPa$_?v+ z*tq>qvGSWk_%Pb78fyzwlyoIh3 zFmT6kXjNO+L5g2X7ubOxdljk!#Fu5dv|OrEyRT9Fit~m6sP+R@da*Ma?mUVX)p7_t z;4*^Ibr_J@&&IR5KSisVJK!C^yWiKp|Nqq4!*aVyTz$5Ss*&})DahSowj>2$m`2c2W=@_9u-fvZqRE(s*e&jZc!Y`0)!cO!bUK4>VnbRDW?D z8!gE!yqzNLPrG~IZ75U=+rbGzp>(Ga*BXE6J>GU1n*6I5R8<#O7js)DJj73327bp< zdWl}5Y7(maR5y8jjg0er`N@aJ=NxQWw%k?J&m{2XDQSY@rcRgdWq z&_xRqA0_ME3q?jOu9!d98%$zx)x2ei^Q!oPXq*}LUB){>?hV6713x35f~M9#iq$5$ z>{Nr>zJ?6-d_Rnas2J+H{dD|UT&%=p%6dC|sCIRMR@-Y24Ek>eQp_)f;*5~qVca&| z31VPB%vNcWc7ZXPe2afl1Qxxsysz`d=Iqq;vxNfO5P%n&E`W#IE<&X~PnscRNEK2Q zp@i)b;x`8>UX6fZYKs%m2blWzV#0{pX-w_SIu?f9^kgos8Qd@L@V&3Obq31wHT$A z?ZXqW-P1<#p031oyyMqs;3xN^ndhZpBX4{g_j1RFkfR2E4lTgV|G*fY_dASN$IQWl zGG8+qwd$0kc-@cZpMzNSpKF>$0OpGd^{77(Z{oVt&(r8>8>VHGbqGnD3&Odyy7+&WkvN zS6+a;ds6VfrXTm@+=F_qI@A%hbgt(qGuw=EoqFUft_tBF)uQ<}7r3(u>-n)ONMDZ( z+`_lq#9jBMhVwa0Qj=c6F&ch42a?roTd)WmRtvY#d7#*=HliJA+*5|D_=P%*<)0bxo-B;w&GE8^&u+#++_s12_q~eYJY29*t~sdT#X*?Ke>+$X}d&?ZOAQuK@Z!tVK6U`mHTqbduU;o*IQigB5=E(oT9Eej;%7cU!=ppaEMOK_tB=> zXcX|{9*pO;D(d;!e_|{5^picjIE+FkPx&rC8Texv__#`U>CM1Bv9blu(2aa8FKVFU z@0d}p1U7Auk^klzKFRfAI4C4>;>77m$%*qS%1cTYy6z(fo_N{D(_Y7M>`LK6R+^~r z6ZgyUE*q`sOIdPgPj*zwj?vFhnLcdT(xpoimySrRcxvIW&b&UQOT~E#S delta 6551 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 ZTh%H*ty??YeAaD3dYP+LFJCU3{snfCeCz-K diff --git a/Jenkinsfile b/Jenkinsfile index 688d31b..9a9b371 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,7 +6,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=101']) { + withEnv(['NEXT_BUILD_NUMBER=102']) { // 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/DocArchive.aspx b/MedAP/DocArchive.aspx index 6ea6e7b..d5412d2 100644 --- a/MedAP/DocArchive.aspx +++ b/MedAP/DocArchive.aspx @@ -12,7 +12,7 @@
ANAGRAFICA CLIENTI
-
+
@@ -72,7 +72,7 @@
DOCUMENTI - FATTURE
-
+
diff --git a/MedAP/Web.config b/MedAP/Web.config index 34d8870..9e39c6e 100644 --- a/MedAP/Web.config +++ b/MedAP/Web.config @@ -51,6 +51,7 @@ + diff --git a/MedAP/WebUserControl/mod_testata.ascx b/MedAP/WebUserControl/mod_testata.ascx index cb08757..46b43cd 100644 --- a/MedAP/WebUserControl/mod_testata.ascx +++ b/MedAP/WebUserControl/mod_testata.ascx @@ -14,10 +14,10 @@
  • - +
  • - <%: nomePag %>  + <%: nomePag %> 
diff --git a/MedAP/WebUserControl/mod_testata.ascx.cs b/MedAP/WebUserControl/mod_testata.ascx.cs index 6667249..878ac14 100644 --- a/MedAP/WebUserControl/mod_testata.ascx.cs +++ b/MedAP/WebUserControl/mod_testata.ascx.cs @@ -192,14 +192,16 @@ namespace MedAP.WebUserControls { get { - string answ = ""; + string answ = "fa fa-refresh"; +#if false try { DataLayer_AnagGen.PermessiRow riga = (DataLayer_AnagGen.PermessiRow)user_std.UtSn.permessi.Select(string.Format("URL = '{0}'", user_std.pagCorrente))[0]; answ = traduci(riga.DESCRIZIONE); } catch - { } + { } +#endif return answ; } } diff --git a/MedAP/bin/Web.config b/MedAP/bin/Web.config index 34d8870..9e39c6e 100644 --- a/MedAP/bin/Web.config +++ b/MedAP/bin/Web.config @@ -51,6 +51,7 @@ +