diff --git a/C2P/Images/LogoCostimate.png b/C2P/Images/LogoCostimate.png
index 4cc5842..8e69905 100644
Binary files a/C2P/Images/LogoCostimate.png and b/C2P/Images/LogoCostimate.png differ
diff --git a/C2P/Web.config b/C2P/Web.config
index cbb5b92..137a0d9 100644
--- a/C2P/Web.config
+++ b/C2P/Web.config
@@ -43,7 +43,15 @@
-
+
+
+
+
+
+
+
+
+
@@ -56,13 +64,6 @@
-
-
-
-
-
-
-
diff --git a/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs
index 6562e50..552dea5 100644
--- a/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs
+++ b/C2P/WebUserControls/mod_DiesGroupMan.ascx.cs
@@ -25,16 +25,27 @@ namespace C2P.WebUserControls
{
// caricato file su server, PROVA ad eseguire import tabella
string fileName = "DiesGroupRaw";
+ string importDataFolder = memLayer.ML.confReadString("importDataFolder");
+ string archiveDataFolder = memLayer.ML.confReadString("archiveDataFolder");
string uplDir = memLayer.ML.confReadString("uplDir");
+ string archDir = memLayer.ML.confReadString("archDir");
string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR");
string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR");
string FIRSTROW = memLayer.ML.confReadString("FIRSTROW");
string CODEPAGE = memLayer.ML.confReadString("CODEPAGE");
bool flgUpdate = memLayer.ML.confReadBool("flgUpdate");
int numTicket = 0; // Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm"));
+
+ // calcolo nuova cartella archivio (anno/mese/gg_ora)
+ DateTime adesso = DateTime.Now;
+ archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archiveDataFolder, adesso);
+ archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archDir, adesso);
+ // sposto i files da TEMP a cartella archive REMOTE
+ fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, "DiesGroupRaw.csv");
+ // parto con la catena di esecuzione con cartella "relativa" al server...
try
{
- DtProxy.man.taDGD.import(fileName, uplDir, "DiesGroupRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorDiesGroup.log", numTicket);
+ DtProxy.man.taDGD.import(fileName, archDir, "DiesGroupRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorDiesGroup.log", numTicket);
}
catch
{ }
diff --git a/C2P/WebUserControls/mod_TranspCostMan.ascx.cs b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs
index 1f4ee60..81d9261 100644
--- a/C2P/WebUserControls/mod_TranspCostMan.ascx.cs
+++ b/C2P/WebUserControls/mod_TranspCostMan.ascx.cs
@@ -25,16 +25,27 @@ namespace C2P.WebUserControls
{
// caricato file su server, PROVA ad eseguire import tabella
string fileName = "TranspCostRaw";
+ string importDataFolder = memLayer.ML.confReadString("importDataFolder");
+ string archiveDataFolder = memLayer.ML.confReadString("archiveDataFolder");
string uplDir = memLayer.ML.confReadString("uplDir");
+ string archDir = memLayer.ML.confReadString("archDir");
string FIELDTERMINATOR = memLayer.ML.confReadString("FIELDTERMINATOR");
string ROWTERMINATOR = memLayer.ML.confReadString("ROWTERMINATOR");
string FIRSTROW = memLayer.ML.confReadString("FIRSTROW");
string CODEPAGE = memLayer.ML.confReadString("CODEPAGE");
bool flgUpdate = memLayer.ML.confReadBool("flgUpdate");
int numTicket = 0; // Convert.ToInt32(DateTime.Now.ToString("yyMMddHHmm"));
+
+ // calcolo nuova cartella archivio (anno/mese/gg_ora)
+ DateTime adesso = DateTime.Now;
+ archiveDataFolder = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archiveDataFolder, adesso);
+ archDir = string.Format(@"{0}{1:yyyy}\{1:MM}\{1:dd}\{1:hhmmss}\", archDir, adesso);
+ // sposto i files da TEMP a cartella archive
+ fileMover.obj.muoviFile(importDataFolder, archiveDataFolder, "TranspCostRaw.csv");
+ // parto con la catena di esecuzione
try
{
- DtProxy.man.taTCD.import(fileName, uplDir, "TranspCostRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorTranspCost.log", numTicket);
+ DtProxy.man.taTCD.import(fileName, archDir, "TranspCostRaw.csv", FIELDTERMINATOR, ROWTERMINATOR, FIRSTROW, CODEPAGE, "errorTranspCost.log", numTicket);
}
catch
{ }
diff --git a/C2P/bin/C2P.dll b/C2P/bin/C2P.dll
index 6015871..5a51359 100644
Binary files a/C2P/bin/C2P.dll and b/C2P/bin/C2P.dll differ
diff --git a/C2P/bin/C2P_Data.dll b/C2P/bin/C2P_Data.dll
index b0b4d79..c0e656b 100644
Binary files a/C2P/bin/C2P_Data.dll and b/C2P/bin/C2P_Data.dll differ
diff --git a/C2P/bin/SteamWare.dll b/C2P/bin/SteamWare.dll
index 86283ef..d3ee58b 100644
Binary files a/C2P/bin/SteamWare.dll and b/C2P/bin/SteamWare.dll differ
diff --git a/C2P/bin/SteamWare.xml b/C2P/bin/SteamWare.xml
index 6c1ae58..1485da2 100644
--- a/C2P/bin/SteamWare.xml
+++ b/C2P/bin/SteamWare.xml
@@ -2332,12 +2332,26 @@
The _nome file.
+
+
+ cerca di caricare il fileinfo o da httpcontext-application re-position o direttamente come workpath + nomefile
+
+ The _path.
+ The _nome file.
+
+
cerca di caricare la directoryInfo o da httpcontext-application re-position o direttamente come workpath
+
+
+ imposta la directory richiesta...
+
+
+
Legge i dati da uno stream fino a quando arriva alla fine.
diff --git a/C2P_CronJob/_uninstall.bat b/C2P_CronJob/_uninstall.bat
index 44b3344..95e0ef9 100644
--- a/C2P_CronJob/_uninstall.bat
+++ b/C2P_CronJob/_uninstall.bat
@@ -5,4 +5,4 @@ echo ---------------------------------------------------
C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\InstallUtil /u %BATPATH%C2P_CronJob.exe
echo ---------------------------------------------------
echo Done.
-pause
\ No newline at end of file
+Pause
\ No newline at end of file
diff --git a/C2P_CronJob/bin/Release/_uninstall.bat b/C2P_CronJob/bin/Release/_uninstall.bat
index 44b3344..95e0ef9 100644
--- a/C2P_CronJob/bin/Release/_uninstall.bat
+++ b/C2P_CronJob/bin/Release/_uninstall.bat
@@ -5,4 +5,4 @@ echo ---------------------------------------------------
C:\WINDOWS\Microsoft.NET\Framework\v4.0.30319\InstallUtil /u %BATPATH%C2P_CronJob.exe
echo ---------------------------------------------------
echo Done.
-pause
\ No newline at end of file
+Pause
\ No newline at end of file
diff --git a/C2P_Report/Reports/ReportOffers_Q.rdlc b/C2P_Report/Reports/ReportOffers_Q.rdlc
index f707c4f..fd0a8c0 100644
--- a/C2P_Report/Reports/ReportOffers_Q.rdlc
+++ b/C2P_Report/Reports/ReportOffers_Q.rdlc
@@ -407,7 +407,7 @@
System.Decimal
- ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png"
+ ="http://IIS02/C2P_Drawings/" & Fields!CodItem.Value & ".png"
valid
diff --git a/C2P_Report/Reports/ReportOffers_S.rdlc b/C2P_Report/Reports/ReportOffers_S.rdlc
index f707c4f..fd0a8c0 100644
--- a/C2P_Report/Reports/ReportOffers_S.rdlc
+++ b/C2P_Report/Reports/ReportOffers_S.rdlc
@@ -407,7 +407,7 @@
System.Decimal
- ="http://c2p.steamware.net/C2P_Drawings/" & Fields!CodItem.Value & ".png"
+ ="http://IIS02/C2P_Drawings/" & Fields!CodItem.Value & ".png"
valid
diff --git a/C2P_Report/Reports/StdCostList.rdlc b/C2P_Report/Reports/StdCostList.rdlc
index d62c154..31ae2ec 100644
--- a/C2P_Report/Reports/StdCostList.rdlc
+++ b/C2P_Report/Reports/StdCostList.rdlc
@@ -170,9 +170,7 @@
-
+
textbox2
@@ -208,9 +206,7 @@
-
+
textbox3
@@ -246,9 +242,7 @@
-
+
textbox4
@@ -284,9 +278,7 @@
-
+
textbox5
@@ -322,9 +314,7 @@
-
+
textbox6
@@ -360,9 +350,7 @@
-
+
textbox7
@@ -398,9 +386,7 @@
-
+
textbox8
@@ -436,9 +422,7 @@
-
+
textbox9
@@ -475,7 +459,7 @@
@@ -512,9 +496,7 @@
-
+
textbox11
@@ -551,7 +533,7 @@
@@ -589,7 +571,7 @@
@@ -627,7 +609,7 @@
@@ -1174,6 +1156,38 @@
true
true
+
+ true
+ true
+
+
+
+
+ Proxima © 2008-2014
+
+
+
+
+
+
+ Textbox15
+ 0.13417in
+ 0.175in
+ 2.25in
+
+
+ 2pt
+ 2pt
+ 2pt
+ 2pt
+
+
true
true
@@ -1214,6 +1228,7 @@
20.32cm
0.175in
3.1in
+ 1
@@ -1243,7 +1258,7 @@
5.25in
0.175in
0.75in
- 1
+ 2
true
@@ -1257,49 +1272,6 @@
2pt
-
- true
- true
-
-
-
-
- Proxima © 2008-
-
-
-
-
- =Format(Today, "yyyy" )
-
-
-
-
-
-
- 0.13417in
- 0.175in
- 3.1in
- 2
-
-
- 2pt
- 2pt
- 2pt
- 2pt
-
-