Egalware/ETS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

inizio vers 98!

Browse Source 
gestione red completata e funzionante (in edit sposta, in creazioen carica su versione red/non red corretta
This commit is contained in:
samuele
2012-10-22 15:30:40 +02:00
parent d5e4bcdbb3
commit 6368b977c5
9 changed files with 141 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1
View File
@@ -10,6 +10,7 @@
/ETS_Data/obj/Release
/ETS_Data/obj/WinLab
/ETS-WS/ETS-WS/ArchivioDocs/*
/ETS-WS/ETS-WS/ArchivioDocsRed/*
/ETS-WS/ETS-WS/logs/*.log
*.suo
ETS-WS/ETS-WS/ETS-WS.csproj
+2 -1
View File
@@ -158,6 +158,8 @@
</Content>
<Content Include="Default.aspx" />
<Content Include="demoUpload.aspx" />
<Content Include="ArchivioDocs\PlaceHolder.file" />
<Content Include="ArchivioDocsRed\PlaceHolder.file" />
<None Include="DocTemplates\email.eml" />
<Content Include="GestioneDocumenti.aspx" />
<Content Include="Help.aspx" />
@@ -648,7 +650,6 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Folder Include="ArchivioDocs\" />
<Folder Include="HelpOnLine\files\" />
<Folder Include="HelpOnLine\teximg\" />
<Folder Include="Styles\" />
ETS-WS/ETS-WS/Web.config
+56 -55
View File
@@ -4,59 +4,60 @@
http://go.microsoft.com/fwlink/?LinkId=169433
-->
<configuration>
<system.web>
<compilation debug="true" targetFramework="4.0">
<assemblies>
<add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
</assemblies>
</compilation>
<httpRuntime executionTimeout="240" maxRequestLength="32768" />
<pages>
<controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls>
</pages>
</system.web>
<appSettings>
<!--config base applicazione-->
<add key="CodModulo" value="ETS-WS" />
<add key="_titoloPagina" value="ETS, gestione protocollo Web" />
<add key="titleApp" value="ETS-WS_titleApp" />
<add key="welcomeApp" value="ETS-WS_welcomeApp" />
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="97" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
<!--area date-->
<add key="defDayFrom" value="-730" />
<!--area controlli grid-->
<add key="srcPageSize" value="15" />
<!--update pagina-->
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.60919.0" newVersion="4.1.60919.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.web>
<compilation debug="true" targetFramework="4.0">
<assemblies>
<add assembly="System.Web.Extensions.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<add assembly="System.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
<add assembly="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B77A5C561934E089" />
</assemblies>
</compilation>
<httpRuntime executionTimeout="240" maxRequestLength="32768" />
<pages>
<controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls>
</pages>
</system.web>
<appSettings>
<!--config base applicazione-->
<add key="CodModulo" value="ETS-WS" />
<add key="_titoloPagina" value="ETS, gestione protocollo Web" />
<add key="titleApp" value="ETS-WS_titleApp" />
<add key="welcomeApp" value="ETS-WS_welcomeApp" />
<add key="appName" value="ETS-WS" />
<add key="SiteName" value="ETS" />
<add key="mainRev" value="1.0" />
<add key="minRev" value="98" />
<add key="copyRight" value="SteamWare, ETS © 2012" />
<add key="tempUplDir" value="~/TempUploads" />
<add key="archiveDir" value="~/ArchivioDocs" />
<add key="archiveDirRed" value="~/ArchivioDocsRed" />
<!--area date-->
<add key="defDayFrom" value="-730" />
<!--area controlli grid-->
<add key="srcPageSize" value="15" />
<!--update pagina-->
<add key="intUpdatePagina_ms" value="120000" />
<!--config x WebServices autocompletamento-->
<add key="MinCharAutocomplete" value="2" />
<add key="MaxRowToDisplay" value="15" />
<!--gestione modalità update richiesta-->
<add key="instantUpdate" value="true" />
<!--area conf dataset classi esterne-->
<add key="ETS_WSConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" />
<add key="ETS_AnagraficaConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" />
</appSettings>
<connectionStrings>
<add name="ETS_Data.Properties.Settings.ETS_WSConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_WS;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
<add name="ETS_Data.Properties.Settings.ETS_AnagraficaConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=ETS_Anagrafica;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="AjaxControlToolkit" publicKeyToken="28f01b0e84b6d53e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.60919.0" newVersion="4.1.60919.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
ETS-WS/ETS-WS/WebShipUtils.cs
+21 -1
View File
@@ -38,6 +38,7 @@ namespace ETS_WS
{
// calcolo valori data e red
string aammgg = metaDati.dataDoc.ToString("yyMMdd");
#if false
string comPath = "";
if (!metaDati.isRed)
{
@@ -48,7 +49,10 @@ namespace ETS_WS
comPath = "comunicazioni_red";
}
// calcolo
answ = string.Format("/{0}/{1}/{2}/{3}/{4}/{5}/", metaDati.commessa, comPath, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg);
answ = string.Format("/{0}/{1}/{2}/{3}/{4}/{5}/", metaDati.commessa, comPath, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg);
#endif
// calcolo
answ = string.Format("/{0}/{1}/{2}/{3}/{4}/", metaDati.commessa, metaDati.fase, metaDati.InOut, metaDati.fonte, aammgg);
}
catch
{ }
@@ -228,6 +232,22 @@ namespace ETS_WS
return answ;
}
/// <summary>
/// statored/pubblico da idx DB
/// </summary>
/// <param name="idxFile"></param>
/// <returns></returns>
public static bool isRedFromIdxFile(int idxFile)
{
bool answ = false;
try
{
answ = utils.obj.taDoc.getByIdxFile(idxFile)[0].isRed;
}
catch
{ }
return answ;
}
/// <summary>
/// fornisce email dato codice fornitore
/// </summary>
/// <param name="codForn"></param>
ETS-WS/ETS-WS/WebUserControls/mod_archivioDocumenti.ascx.cs
+35 -3
View File
@@ -171,7 +171,7 @@ namespace ETS_WS.WebUserControls
}
return answ;
}
/// <summary>
/// <summary>
/// gestione update ods
/// </summary>
/// <param name="sender"></param>
@@ -186,6 +186,38 @@ namespace ETS_WS.WebUserControls
e.InputParameters["AnnoCommessa"] = commessa.Substring(commessa.IndexOf("-") + 1);
// tolgo commessa che non c'è su query
e.InputParameters.Remove("Commessa");
// controllo se è cambiata la directory red/non red e nel caso sposto file!
bool isRed_Original = false;
bool isRed = false;
try
{
isRed_Original = WebShipUtils.isRedFromIdxFile(WebShipUtils.mng.idxFileEdit);
isRed = Convert.ToBoolean(e.InputParameters["isRed"]);
}
catch (Exception exc)
{
lg.Info("Errore recupero stato red old/new", exc);
}
if (isRed != isRed_Original)
{
// dati del file originale..
docMetaDataSet docsData = WebShipUtils.mng.docMetaFromIdxFile(WebShipUtils.mng.idxFileEdit);
// calcolo nuovo path
string fromPath = "";
string destPath = "";
if (isRed)
{
fromPath = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
destPath = string.Format("{0}{1}", utils.obj.confReadString("archiveDirRed"), docsData.path);
}
else
{
fromPath = string.Format("{0}{1}", utils.obj.confReadString("archiveDirRed"), docsData.path);
destPath = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
}
// sposto file a nuova dest...
fileMover.obj.muoviFile(fromPath, destPath, WebShipUtils.nomeFileFullFromIdxFile(WebShipUtils.mng.idxFileEdit));
}
}
/// <summary>
/// mostro button x sostituzione file
@@ -279,10 +311,10 @@ namespace ETS_WS.WebUserControls
utils.obj.taTags2Doc.Insert(WebShipUtils.mng.idxFileEdit, Convert.ToInt32(tag.Value));
}
catch
{ }
{ }
}
}
}
}
}
ETS-WS/ETS-WS/WebUserControls/mod_myTempFile.ascx.cs
+13 -3
View File
@@ -204,12 +204,22 @@ namespace ETS_WS.WebUserControls
// verifico path presente
if (pathDest != "")
{
// aggiunto al path cartella archivio...
pathDest = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
// verifico se è comunicazione red = riservata
string comPath = "";
if (!docsData.isRed)
{
comPath = utils.obj.confReadString("archiveDir");
}
else
{
comPath = utils.obj.confReadString("archiveDirRed");
}
// aggiunto al path cartella archivio corretta...
pathDest = string.Format("{0}{1}", comPath, docsData.path);
// verifico path valido o creo...
fileMover.checkDir(pathDest);
string nomeFile = "";
string redattore = utils.obj.currUserCognomeNome; // usa utente corrente
string redattore = utils.obj.currUserNomeCognome; // usa utente corrente
// sposto i files selezionati secondo i dati in sessione
foreach (GridViewRow riga in grView.Rows)
{
ETS-WS/ETS-WS/WebUserControls/mod_pathAndDocs.ascx.cs
+13 -1
View File
@@ -83,7 +83,19 @@ namespace ETS_WS.WebUserControls
string pathDest = docsData.path;
if (pathDest != "")
{
pathDest = string.Format("{0}{1}", utils.obj.confReadString("archiveDir"), docsData.path);
// verifico se è comunicazione red = riservata
string comPath = "";
if (!docsData.isRed)
{
comPath = utils.obj.confReadString("archiveDir");
}
else
{
comPath = utils.obj.confReadString("archiveDirRed");
}
// aggiunto al path cartella archivio corretta...
pathDest = string.Format("{0}{1}", comPath, docsData.path);
// fix redattore
string redattore = utils.obj.currUserCognomeNome; // usa utente corrente
idxFile = WebShipUtils.archiviaFile(docsData, WebShipUtils.mng.UserTempPath, pathDest, nomeTemplate, redattore);
// recupero dati documento
ETS-WS/ETS-WS/bin/ETS-WS.dll
BIN
View File
Binary file not shown.
ETS-WS/ETS-WS/bin/ETS_Data.dll
BIN
View File
Binary file not shown.