remake dell'installer
git-svn-id: https://keyhammer.ath.cx/svn/WebGIM/trunk@186 3e04ef4b-3b25-4b6c-be27-bb5389ca777b
This commit is contained in:
samuele
@@ -19,30 +19,6 @@ public class WebGimUtils
|
||||
public double oreEquivalenti(intervalloDate periodo)
|
||||
{
|
||||
double answ = 0;
|
||||
#if false
|
||||
// carico valori di default
|
||||
double oreSett = (double)TA_app.obj.taOreApert.oreAperturaSett();
|
||||
GIM_data.DS_applicazione.OreAperturaSettDataTable tabOre = TA_app.obj.taOreApert.GetData();
|
||||
GIM_data.DS_applicazione.CalendFesteFerieDataTable tabCalFF = TA_app.obj.taCalFF.getByPeriodo(periodo.inizio, periodo.fine);
|
||||
// calcolo il numero di settimane comprese nel periodo
|
||||
int numSett = (int)Math.Floor(periodo.fine.Subtract(periodo.inizio).TotalDays / 7);
|
||||
// moltiplico per le h/sett
|
||||
answ = oreSett * numSett;
|
||||
// aggiungo le ore delle giornate che eccedono il multiplo delle settimane
|
||||
int numGgRimanenti = (int)(periodo.fine.Subtract(periodo.inizio).TotalDays - numSett * 7);
|
||||
// NB: dayOfWeek è 0-6 da domenica a sabato...
|
||||
int ggSett = (int)periodo.inizio.DayOfWeek;
|
||||
for (int i = 0; i < numGgRimanenti; i++)
|
||||
{
|
||||
// il primo giorno è pari al giorno iniziale... e poi calcolo il "modulo" a 7 (con "%")
|
||||
answ = answ + (double)tabOre[(i + ggSett) % 7].apertura;
|
||||
}
|
||||
// cerco eventuali festività che cadano nel periodo e le tolgo
|
||||
foreach (GIM_data.DS_applicazione.CalendFesteFerieRow riga in tabCalFF)
|
||||
{
|
||||
answ = answ - (double)tabOre[(int)riga.data.DayOfWeek].apertura;
|
||||
}
|
||||
#endif
|
||||
try
|
||||
{
|
||||
answ = Convert.ToDouble(TA_app.obj.taOreApert.oreLavoratePeriodo(periodo.inizio, periodo.fine, 0));// per ora non imposto la macchina...
|
||||
|
||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
@@ -100,7 +100,7 @@
|
||||
<add key="welcomeApp" value="GIM_welcomeApp"/>
|
||||
<add key="appName" value="GIM"/>
|
||||
<add key="mainRev" value="1.1"/>
|
||||
<add key="minRev" value="190"/>
|
||||
<add key="minRev" value="195"/>
|
||||
<add key="copyRight" value="SteamWare © 2006-2011"/>
|
||||
<add key="defaultApp" value="GIM_Appl"/>
|
||||
<add key="defaultTitle" value="GIM_ShortWelcome"/>
|
||||
@@ -111,10 +111,10 @@
|
||||
<add key="exportFormat3" value="./ExportPdf.aspx?tipo={0}&inizio={1}&fine={2}&username={3}"/>
|
||||
<add key="_logDir" value="./logs/"/>
|
||||
<add key="_smtpCli" value="localhost"/>
|
||||
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="PermessiConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM_som;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="UtenteCdcConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=SteamWare_Anagrafica;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="VocabolarioConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=SteamWare_Vocabolario;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="AppConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="AppConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM_som;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<add key="TestAppConnectionString" value="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM_test;Persist Security Info=True;User id=sa;Password=keyhammer"/>
|
||||
<!--valori default-->
|
||||
<add key ="defaultMatr" value="0000"/>
|
||||
@@ -147,7 +147,7 @@
|
||||
<add key ="stampanteRichiesteMtz" value="PDFCreator"/>
|
||||
</appSettings>
|
||||
<connectionStrings>
|
||||
<add name="GIMConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
|
||||
<add name="GIMConnectionString" connectionString="Data Source=10.74.82.217\SQL2008R2;Initial Catalog=GIM_som;Persist Security Info=True;User ID=sa;Password=keyhammer" providerName="System.Data.SqlClient"/>
|
||||
</connectionStrings>
|
||||
<system.webServer>
|
||||
<validation validateIntegratedModeConfiguration="false" />
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<add key="welcomeApp" value="GIM_welcomeApp"/>
|
||||
<add key="appName" value="GIM"/>
|
||||
<add key="mainRev" value="1.1"/>
|
||||
<add key="minRev" value="190"/>
|
||||
<add key="minRev" value="195"/>
|
||||
<add key="copyRight" value="SteamWare © 2006-2011"/>
|
||||
<add key="defaultApp" value="GIM_Appl"/>
|
||||
<add key="defaultTitle" value="GIM_ShortWelcome"/>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -351,14 +351,14 @@
|
||||
{
|
||||
"Name" = "8:Microsoft Visual Studio"
|
||||
"ProductName" = "8:WebGIM"
|
||||
"ProductCode" = "8:{DB6C1FF5-83F0-4160-AF99-C32A50FAB734}"
|
||||
"PackageCode" = "8:{838D1675-7B14-4F48-806D-7027DEDCA093}"
|
||||
"ProductCode" = "8:{00D2034A-46DF-4EC5-9AAB-258E31BB2136}"
|
||||
"PackageCode" = "8:{95B78167-501C-49FA-BA77-2194BA9044BA}"
|
||||
"UpgradeCode" = "8:{7739196B-46A3-4BC7-AC29-DB8493976F04}"
|
||||
"RestartWWWService" = "11:TRUE"
|
||||
"RemovePreviousVersions" = "11:TRUE"
|
||||
"DetectNewerInstalledVersion" = "11:TRUE"
|
||||
"InstallAllUsers" = "11:FALSE"
|
||||
"ProductVersion" = "8:1.1.190"
|
||||
"ProductVersion" = "8:1.1.195"
|
||||
"Manufacturer" = "8:SteamWare s.r.l."
|
||||
"ARPHELPTELEPHONE" = "8:035-460560"
|
||||
"ARPHELPLINK" = "8:http://www.steamware.net"
|
||||
|
||||
Reference in New Issue
Block a user