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

update versione 2.4.600 x TK

Browse Source 
- gestione fuoriciclo (/con attributo + nota in cartellino) x TK
- aggiunti termini in vocabolario
- update dacpac GMW
This commit is contained in:
Samuele Locatelli
2014-02-21 14:33:55 +01:00
parent caa9716f99
commit 4f2e75c507
16 changed files with 68810 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW/GMW.csproj
+4
View File
@@ -1188,6 +1188,10 @@
<Project>{47143721-A018-4BDA-B544-EC3E10BC87A2}</Project>
<Name>GMW_data</Name>
</ProjectReference>
<ProjectReference Include="..\VersGen\VersGen.csproj">
<Project>{7c587950-a570-489c-9784-27256384e57e}</Project>
<Name>VersGen</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Reports\CartellinoMP.rdlc" />
GMW/Web.config
+2 -2
View File
@@ -65,8 +65,8 @@
<add key="welcomeApp" value="GMW_welcomeApp" />
<add key="appName" value="GMW" />
<add key="SiteName" value="Tekal" />
<add key="mainRev" value="2.4" />
<add key="minRev" value="600" />
<!--<add key="mainRev" value="2.4" />
<add key="minRev" value="600" />-->
<add key="copyRight" value="SteamWare © 2010" />
<add key="_allowForceUser" value="true" />
<add key="_safePages" value="jumper.aspx#unauthorized.aspx#allegati.aspx#forceUser.aspx#login.aspx#test.aspx#istruzioni.aspx#Test.aspx" />
GMW/WebUserControls/mod_finitiTK.ascx.cs
+7 -1
View File
@@ -20,6 +20,10 @@ namespace GMW.WebUserControls
/// </summary>
protected string statoUDC = "Fin";
/// <summary>
/// attributo per Fuoriciclo
/// </summary>
protected string attrFC = "FC";
/// <summary>
/// stringa UID univoca
/// </summary>
public string uid
@@ -495,7 +499,7 @@ namespace GMW.WebUserControls
if (postazione_printer != "n.d.")
{
string newUdcChild = "";
string noteTrim = txtNote.Text.Trim();
string noteTrim = string.Format("{0}{1}{2}", traduci("fuoriciclo"), Environment.NewLine, txtNote.Text.Trim());
// effettuo controlli che cod_soggetto e cod particolare siano disponibili...
string codSogg = "";
string particolare = "";
@@ -519,6 +523,8 @@ namespace GMW.WebUserControls
newUdcChild = MagClass.magazzino.creaUdc(flusso, "", currParticolare, "", "", "", "", "", 0, memLayer.ML.confReadString("CodImballoFiniti"), "U", MagClass.magazzino.CodSoggCurrUser, qtaUDC, 0, 0, adesso, 0, statoUDC, memLayer.ML.confReadInt("IdxPosizioneFiniti"), "IdxPosizioneFiniti", "UDC_FINITO", noteTrim, "", adesso.Year, Request.UserHostName);
// registro creazione nuovo UDC
MagClass.magazzino.taSAO.insertQuery(adesso, codSogg, postazione_name, postazione_IP, newUdcChild, particolare, "creaUDC", string.Format("Creato nuovo UDC Finiti, qta: {0} {1}", qtaUDC, noteTrim));
// inserisco attributo fuoriciclo
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, attrFC, "", DateTime.Now, codSogg);
}
catch (Exception exc)
{
GMW/WebUserControls/mod_trattamenti.ascx.cs
+1 -1
View File
@@ -633,7 +633,7 @@ namespace GMW.WebUserControls
// calcolo il nuovo codice UDC del trattamento
newUdcParent = MagClass.magazzino.getComposizioneUDC(memLayer.ML.confReadString("CodCS"), flusso_TR, anno.ToString(), Convert.ToInt32(kvp.Key));
// inserisco attributo trattamento
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, attrNumTra, newUdcParent,DateTime.Now, "");
MagClass.magazzino.taAtt2UDC.Insert(newUdcChild, attrNumTra, newUdcParent,DateTime.Now, codSogg);
}
// ora stampo il nuovo cartellino!!!
MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartTratt, Request.UserHostName);
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW_DB/DbSnapshot/GMW_update.dacpac
BIN
View File
Binary file not shown.
GMW_DB/GMW_DB.sqlproj
+1
View File
@@ -82,6 +82,7 @@
<Folder Include="External\DB" />
<Folder Include="DataLoad" />
<Folder Include="DbSnapshot" />
<Folder Include="Snapshots" />
</ItemGroup>
<ItemGroup>
<Build Include="dbo\Tables\Blocchi.sql" />
GMW_DB/bin/Release/GMW_DB.dacpac
BIN
View File
Binary file not shown.
GMW_DB/bin/Release/GMW_DB.dll
BIN
View File
Binary file not shown.
GMW_DB/obj/Release/GMW_DB.dll
BIN
View File
Binary file not shown.
GMW_DB/obj/Release/GMW_DB.sqlproj.FileListAbsolute.txt
+4
View File
@@ -4,3 +4,7 @@ C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\GM
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\GMW_DB.dll
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\GMW_DB.pdb
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\bin\Release\ProduzionePossidonio.dacpac
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\Model.xml
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\refactor.xml
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\postdeploy.sql
C:\Users\samuele\Documents\Visual Studio 2012\Projects\GMW\GMW_DB\obj\Release\predeploy.sql
GMW_DB/obj/Release/Model.xml
+68765
View File
File diff suppressed because it is too large Load Diff
GMW_DB/obj/Release/postdeploy.sql
+15
View File
@@ -0,0 +1,15 @@
/*
Post-Deployment Script Template
--------------------------------------------------------------------------------------
This file contains SQL statements that will be appended to the build script.
Use SQLCMD syntax to include a file in the post-deployment script.
Example: :r .\myfile.sql
Use SQLCMD syntax to reference a variable in the post-deployment script.
Example: :setvar TableName MyTable
SELECT * FROM [$(TableName)]
--------------------------------------------------------------------------------------
*/
--:r .\voc.Lingue.data.sql
--:r .\voc.Vocabolario.data.sql
GO
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.4.600.5165")]
[assembly: AssemblyFileVersion("2.4.600.5165")]
[assembly: AssemblyVersion("2.4.601.1512")]
[assembly: AssemblyFileVersion("2.4.601.1512")]
//[assembly: AssemblyCopyright("© Steamware 2007-2014")]
//[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+3 -2
View File
@@ -13,6 +13,7 @@ using System.Reflection;
<#+
int Major = 2;
int Minor = 4;
int Build = 600;
int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2000,1,1)).TotalDays;
int Build = 601;
// int RevisionNumber = (int)(DateTime.Now - DateTime.Today).TotalSeconds;
int RevisionNumber = (int)(DateTime.UtcNow - new DateTime(2010,1,1)).TotalDays;
#>
VersGen/VersGen.csproj.user
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>