From 7e994bfeb7613b0c8649668a399c62c0a5312c0b Mon Sep 17 00:00:00 2001 From: samuele Date: Fri, 31 Aug 2012 10:49:41 +0000 Subject: [PATCH] Avanzamento gestione documenti git-svn-id: https://keyhammer.ath.cx/svn/ETS/trunk@24 72332f79-082b-4ce8-9953-5b7f197a49bb --- ETS-WS/ETS-WS.sln | 13 +- ETS-WS/ETS-WS.suo | Bin 94720 -> 94720 bytes ETS-WS/ETS-WS/Default.aspx | 1 - ETS-WS/ETS-WS/Default.aspx.cs | 2 +- ETS-WS/ETS-WS/ETS-WS.csproj | 136 +++++++++++++++--- ETS-WS/ETS-WS/GestioneDocumenti.aspx | 13 +- ETS-WS/ETS-WS/Web.config | 47 +++--- .../WebMasterPages/AjaxSimpleFull.Master | 9 +- .../mod_archivioDocumenti.ascx | 12 +- .../WebUserControls/mod_gestioneDati.ascx | 2 +- .../mod_gestioneDati.ascx.designer.cs | 9 -- .../mod_gestioneDocumenti.ascx | 33 ++--- .../ETS-WS/WebUserControls/mod_inputDati.ascx | 55 ++++--- ETS-WS/ETS-WS/bin/ETS-WS.dll | Bin 12800 -> 12800 bytes ETS-WS/ETS-WS/bin/ETS_Data.dll | Bin 158720 -> 144384 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 16745 -> 17055 bytes ...TS-WS.csprojResolveAssemblyReference.cache | Bin 44270 -> 43577 bytes ETS-WS/ETS-WS/obj/Release/ETS-WS.dll | Bin 11264 -> 12288 bytes ETS-WS/ETS-WS/packages.config | 4 +- ETS_Data/ETS_Data.csproj | 20 ++- ETS_Data/bin/Release/ETS_Data.dll | Bin 135680 -> 144384 bytes ...gnTimeResolveAssemblyReferencesInput.cache | Bin 6854 -> 6839 bytes .../ETS_Data.csproj.FileListAbsolute.txt | 1 - ETS_Data/obj/Release/ETS_Data.dll | Bin 135680 -> 144384 bytes .../Release/TempPE/DS_utils.Designer.cs.dll | Bin 42496 -> 49152 bytes 25 files changed, 228 insertions(+), 129 deletions(-) diff --git a/ETS-WS/ETS-WS.sln b/ETS-WS/ETS-WS.sln index 563c6d6..712bd0a 100644 --- a/ETS-WS/ETS-WS.sln +++ b/ETS-WS/ETS-WS.sln @@ -9,7 +9,6 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU - Test218|Any CPU = Test218|Any CPU WinLab|Any CPU = WinLab|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution @@ -17,18 +16,14 @@ Global {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Release|Any CPU.Build.0 = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Test218|Any CPU.ActiveCfg = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.Test218|Any CPU.Build.0 = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.Build.0 = Release|Any CPU + {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {ACE9E793-6523-4B9A-82C6-282D61D358C9}.WinLab|Any CPU.Build.0 = WinLab|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0A14058F-ED18-4F82-91C9-93945C2C409A}.Release|Any CPU.Build.0 = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.Test218|Any CPU.ActiveCfg = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.Test218|Any CPU.Build.0 = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.ActiveCfg = Release|Any CPU - {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.Build.0 = Release|Any CPU + {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.ActiveCfg = WinLab|Any CPU + {0A14058F-ED18-4F82-91C9-93945C2C409A}.WinLab|Any CPU.Build.0 = WinLab|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ETS-WS/ETS-WS.suo b/ETS-WS/ETS-WS.suo index e77c1dfc800890b30f329d7579dba80ecd44e511..fa6ba47aa0366a677780b31913e1479482497c55 100644 GIT binary patch delta 4309 zcmd5HD68rfPe!N~)!uz1Q}Zy&%*}-Uj## z$4Orho#$|uGz4<-xU|kI2Zqe$IhyK)+0M5`cvuqEVRi*LCp5a96f;&Zdt4QR8kczI zxfO7gG~O)Ez?EQ*UleFa>SOgi0v`O`6o{0jk}wW5>kf3Nt3eY~zP3l@I`@F!(Z)fKQDM7zbfa_pPqmT^X| zgsY)}G?0Ug6+|^~MK~)kHQ9N0LSyFPAF^LN)G_I1#bxF#dpUZ(>Fe_H{b~E& zc%^&m)YouW{`d9z1h>uaX1_7r>z^Infq+2^LvZ|NfiRjZOY#2%LJ*!q!H2yjK}dg^KnN`sIWPwQ!0t3J{%ijLC?@} zDaZoYO}=ds)C;?%;?hbJj-Ndq-D^h63UoVL}d_RX5W1IcbB3d=DYk8tjf$`zlcDBDeD|5(3!)}h34Ro_9@k$Tt~S}Nm*HTV zP3T^8PmGo?L$G~8h-?vcs3zEF>GT6peV8Z9pqV>w?xR~hJ1eGQ_Az{Wdn7i*!LuOe| zZf0YH*g&w*4*xbh2DEHf;Q03^!!eRo2I+bp!3st#~adq~qW*=-Q=|xBxq#vxoPUV17FX zP*)J;)=8oh1S-6j59AA;C-#V~o%clF?rq--SU)iaue};7C{A8=!rn6`!E`1Yu#XW3 zR8C$~dpthS%=+`jGB{F)m(-G#k}awOQN2;yrOfiyjpi>D`z({rhuj*H`zgrP^t z#So?C5=f>cDv`95^o}7t6@7JFG^e4jmN0|w$%M%C8KfLTPXbk@ar4mMKb@{m)oqS#W zzg?ZvavWbNny%jB&A%8AZ#`Pu_|~Tfp8u3G(EUQ{IuBwW?0gkXtClVx<7w!*+@mAP zGNMde8D(WQv})3zERUbOJWWIkxjzAt#|#eolTICJRB=TQ+T^_wU^L$u3{nr4s)p>_ zt@Be7L1R5lw}@n_h$T2;?dcvDaxn$w`=Y<(u<+}~68ZrG6~0*m8*R4|K_LP&(e)qfQF!!L`c3T5d z5#Q|#Rko@uXdTtM7&fCSUXQ)&qS5rd1h;)vD4Y_SM3iP(n**EGR|NM_3W7VtsWO(qWJrwpL1pD#3_a)ZqE_* z6uF&>(4=h!8d>v`P5j9^@W+sEiunmO@D<-v2MTO%3v~pn1#X{!K1oH-(;6Lbs)eO& z-P&rPct|rOrWR{c{ZYQf70;dDfc<9!guol;V9H$@%xdcCB|-s#4Q`#|%V@S9?E894 z-b8q^B`Ni`@a1ukw9gx=!0W{;3q+Tn_~6xp z&uvW~o0Oa_Y02~9H~2ubM^gWtoyGeeTl%qchxCrpF2CplL3~#%JkRIGgN%=$7whKz z_aKX6?tuF)1&H_?`LLErZSAh`1c~Dny!#~Z#-MvLo5~$Z#8Ak$#KRh&68ruBHx4In z@&yT&+$rQkqu{)axJ@)UHwfULoeHk}wH#2`lKkPQ6#M#oag!yGzn%)7z=ny%abdiB z8c1=QA_DvT)L!v)npynRP#95BNLHdIo#$Jpz|?ddRm6-0(KO;%9M;mqBC>|~Xlk5B z!848;rrO_n`W=d(=(CK=r!`L3X3hRDGqO>*IWMstoCI2t^`~cTG=)x=)?~<#upgqK zy=6{@`FutSOy>uZ!5&?Ba|+u_*`&h$@rL%>Knlp|y84qZTV!AU`c&|=mB&Dc80?{S zC%;+_kMJdnz?;&KhK4-Do=#Y5QPS{LG#xgv7|IAN1+mF87qEPyBN@vmiPSFEG1*iu zhGmQ?75E2^M1=_2*X!AFUkMm#1E>njlo#Hmw7e@VRV8Aab z$S6CqgM+)$0KkabV^eU`k*RoRtiRu{rVu~+nMcAo8pm7ali?+Q?haVk!YJ`5zsHmydSIhwm=B5y;%&` zo%s`W5XdiI3?bP6tqOZL1_-k6B!GMSPd}6@6f7$HVM(hBv#h>C(2Z-*S_PIay#)mM uKs)v42r)seCeX`RU|vXY>}wOnOt!q*5z&AN)(_qI&&`vw#d4)3V&&iBV_zr$ delta 4626 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 D9T`)8 diff --git a/ETS-WS/ETS-WS/Default.aspx b/ETS-WS/ETS-WS/Default.aspx index e8409d4..085a5ba 100644 --- a/ETS-WS/ETS-WS/Default.aspx +++ b/ETS-WS/ETS-WS/Default.aspx @@ -9,7 +9,6 @@
-
diff --git a/ETS-WS/ETS-WS/Default.aspx.cs b/ETS-WS/ETS-WS/Default.aspx.cs index 486c6ae..eaefee8 100644 --- a/ETS-WS/ETS-WS/Default.aspx.cs +++ b/ETS-WS/ETS-WS/Default.aspx.cs @@ -21,7 +21,7 @@ namespace ETS_WS utils.obj.setSessionVal("UserTempPath", string.Format("{0}/{1}", utils.obj.confReadString("tempUplDir"), utils.obj.currUser_FS)); } // rimando a gestione documenti - Response.Redirect("~/GestioneDocumenti.aspx"); + Response.Redirect("~/Menu.aspx"); } } } \ No newline at end of file diff --git a/ETS-WS/ETS-WS/ETS-WS.csproj b/ETS-WS/ETS-WS/ETS-WS.csproj index e9de8f5..7d7caf8 100644 --- a/ETS-WS/ETS-WS/ETS-WS.csproj +++ b/ETS-WS/ETS-WS/ETS-WS.csproj @@ -32,26 +32,39 @@ prompt 4 + + bin\ + TRACE + true + pdbonly + AnyCPU + bin\ETS-WS.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets + false + ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules + false + - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\AjaxControlToolkit.dll ..\packages\AjaxMin.4.59.4576.13504\lib\net20\AjaxMin.dll - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\HtmlAgilityPack.dll ..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll - + ..\packages\AjaxControlToolkit.4.1.60623\lib\40\SanitizerProviders\SanitizerProviders.dll - - ..\packages\SCS.MenuExtender.2.0.1\lib\net40\SCS.MenuExtender.dll - @@ -69,6 +82,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Always @@ -84,16 +151,18 @@ + - - - - + + + + + @@ -141,24 +210,20 @@ - Always - - - - - + + + + + Designer - - Web.config - Web.config @@ -167,6 +232,7 @@ + @@ -195,6 +261,20 @@ GestioneDocumenti.aspx + + Help.aspx + ASPXCodeBehind + + + Help.aspx + + + Menu.aspx + ASPXCodeBehind + + + Menu.aspx + ricerca.aspx @@ -259,6 +339,13 @@ mod_inputDati.ascx + + mod_menu.ascx + ASPXCodeBehind + + + mod_menu.ascx + mod_menuBottomFullpage.ascx ASPXCodeBehind @@ -297,10 +384,8 @@ - - - + @@ -311,6 +396,13 @@ Designer + + Web.config + + + Web.config + Designer + diff --git a/ETS-WS/ETS-WS/GestioneDocumenti.aspx b/ETS-WS/ETS-WS/GestioneDocumenti.aspx index fdca2f3..8254aa0 100644 --- a/ETS-WS/ETS-WS/GestioneDocumenti.aspx +++ b/ETS-WS/ETS-WS/GestioneDocumenti.aspx @@ -7,14 +7,15 @@ <%@ Register Src="WebUserControls/mod_gestioneDati.ascx" TagName="mod_gestioneDati" TagPrefix="uc2" %> <%@ Register Src="WebUserControls/mod_fileUpload.ascx" TagName="mod_fileUpload" TagPrefix="uc3" %> - -
- -
+ +
+ + +
- +
-
+
diff --git a/ETS-WS/ETS-WS/Web.config b/ETS-WS/ETS-WS/Web.config index 79ea9d3..faaf233 100644 --- a/ETS-WS/ETS-WS/Web.config +++ b/ETS-WS/ETS-WS/Web.config @@ -1,4 +1,4 @@ - + - - - - - - - - - - + + + + + + + + + + - + - - + + - + + - - + + diff --git a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master index 0570ade..e12b0f5 100644 --- a/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master +++ b/ETS-WS/ETS-WS/WebMasterPages/AjaxSimpleFull.Master @@ -10,8 +10,13 @@ GMW - - + + + <%--Area jQuery & co--%> + <%-- +