diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index d6b7139..f42ab4d 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index 7aad1ad..bb9a916 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index 0bb7d8c..1c59f48 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index d6b7139..f42ab4d 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index 0bb7d8c..1c59f48 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll index 4b35942..61c75b6 100644 Binary files a/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index d33dd45..9eb2391 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -322,6 +322,7 @@ Designer + diff --git a/CMS_SC/Properties/PublishProfiles/IIS01.pubxml b/CMS_SC/Properties/PublishProfiles/IIS01.pubxml new file mode 100644 index 0000000..7c2e454 --- /dev/null +++ b/CMS_SC/Properties/PublishProfiles/IIS01.pubxml @@ -0,0 +1,60 @@ + + + + + MSDeploy + False + Release + Any CPU + + True + True + True + False + DonotMerge + True + https://IIS01:8172/MsDeploy.axd + Default Web Site/CMS_SC + + False + WMSVC + True + steamw\administrator + <_SavePWD>True + + + + + + + + + + + + + + + + + + + + + + + + + + + + False + + + False + + + \ No newline at end of file diff --git a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml index a419f41..9466501 100644 --- a/CMS_SC/Properties/PublishProfiles/IIS02.pubxml +++ b/CMS_SC/Properties/PublishProfiles/IIS02.pubxml @@ -10,14 +10,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt Any CPU True - False + True https://IIS02:8172/MsDeploy.axd Default Web Site/CMS_SC - True + False WMSVC True - steamwarewin\administrator + steamw\administrator <_SavePWD>True @@ -44,6 +44,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt False + True + True + False + DonotMerge diff --git a/CMS_SC/StatoDossiers.aspx.cs b/CMS_SC/StatoDossiers.aspx.cs index 50008bf..a05d67a 100644 --- a/CMS_SC/StatoDossiers.aspx.cs +++ b/CMS_SC/StatoDossiers.aspx.cs @@ -27,7 +27,17 @@ namespace CMS_SC } mod_righePag.eh_newNum += mod_righePag_eh_newNum; mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore; + mod_StatoCollaudi.eh_selezioneValore += Mod_StatoCollaudi_eh_selezioneValore; } + + private void Mod_StatoCollaudi_eh_selezioneValore(object sender, EventArgs e) + { + // salvo parametri + savePar("ddlDossier", mod_elencoDossiers.idxDossier.ToString()); + // rimando a dettaglio... + Response.Redirect("Collaudi"); + } + /// /// cerca di recuperare i 3 parametri selezionati dall'utente (SE ci sono su DB) /// diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs index 613a8d6..bbcd87c 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs @@ -90,10 +90,21 @@ namespace CMS_SC.WebUserControls CodSchedaVersNum = string.Format("{0}.{1}.{2}", grView.SelectedDataKey["CodScheda"], grView.SelectedDataKey["Vers"], grView.SelectedDataKey["NumScheda"]); if (CodSchedaVersNum != "") { - // salvo selezione... - // rimando a dettaglio.... + // salvo parametro + savePar("ddlSelScheda", CodSchedaVersNum); + // sollevo evento... + raiseEvent(); } } + /// + /// salva su DB il parametro scelto dall'utente + /// + /// + /// + protected void savePar(string paramName, string paramValue) + { + DtProxy.man.taUsrPar.upsert(OpAuth.currAuth.email, paramName, paramValue); + } protected void btnReset_Click(object sender, EventArgs e) { resetSelezione(); diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index d6b7139..1c59f48 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 738789a..74562c8 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 7aad1ad..c7181a1 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/CMS_SC/sql/ManualUpdate_2.0_2.1.sql b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql index 3df9f91..d758eb7 100644 --- a/CMS_SC/sql/ManualUpdate_2.0_2.1.sql +++ b/CMS_SC/sql/ManualUpdate_2.0_2.1.sql @@ -1,4 +1,23 @@ +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',1,'NON INIZIATA',1) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',2,'IN CORSO',2) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',3,'COMPLETATA KO',3) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',4,'COMPLETATA DEROGA',4) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',5,'COMPLETATA OK',5) + + +-- update vocabolario +exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente' +exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers' +exec voc.stp_insNewLemma 'StatoCollaudi', 'Stato Collaudi' + + + +-- permessi & funzioni +INSERT INTO dbo.Permessi(COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Collaudi_StatoDossiers','StatoDossiers',2,4,'StatoDossiers','StatoDossiersIcon') +INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoOfficina', 'S') +INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoGruppo', 'S') + -- genero calcolo x valori ordinali ATTUALI exec util.stp_setupOrdinal_SCFM SELECT ROW_NUMBER() OVER(PARTITION BY CodFam ORDER BY CodScheda, Vers) AS Riga, * @@ -12,31 +31,3 @@ FROM SchemaCollMacc exec util.stp_setupOrdinal_Mis SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier, Fase ORDER BY CodScheda, Vers, NumScheda, CodMisura) AS Riga, * FROM Misure - -/****************************************************** -* FARE!!!! -* -* - verifica di modifiche x procedure insert x SCFM, SCM, Misure -* - verifica di modifiche x procedure update x SCFM, SCM, Misure -* - modifica interfaccia x effettuare spostamenti ordine x SCFM e SCM (mis NON va reso modificabile, o piuttosto al cambio di SCM --> inserisce in detail i valori già "calcolati") -* - testare funzionamento pagine SCFM, SCM (Dossier), Misure (Collaudi) -* -******************************************************/ - - - - --- update vocabolario -exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente' -exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers' -exec voc.stp_insNewLemma 'StatoCollaudi', 'Stato Collaudi' - - --- modifiche DB - ---update calcolo ordinamento - --- permessi & funzioni -INSERT INTO dbo.Permessi(COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Collaudi_StatoDossiers','StatoDossiers',2,4,'StatoDossiers','StatoDossiersIcon') -INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoOfficina', 'S') -INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoGruppo', 'S') diff --git a/Release Clienti/CMS_SC.zip b/Release Clienti/CMS_SC.zip index ec5ef23..a697704 100644 Binary files a/Release Clienti/CMS_SC.zip and b/Release Clienti/CMS_SC.zip differ diff --git a/Release Clienti/ManualUpdate_2.0_2.1.sql b/Release Clienti/ManualUpdate_2.0_2.1.sql new file mode 100644 index 0000000..d758eb7 --- /dev/null +++ b/Release Clienti/ManualUpdate_2.0_2.1.sql @@ -0,0 +1,33 @@ + +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',1,'NON INIZIATA',1) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',2,'IN CORSO',2) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',3,'COMPLETATA KO',3) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',4,'COMPLETATA DEROGA',4) +INSERT INTO ListValues (TableName,FieldName,value,label,ordinal) VALUES ('v_statoCollaudi','Stato',5,'COMPLETATA OK',5) + + +-- update vocabolario +exec voc.stp_insNewLemma 'btnClonaConfFamMacch', 'Merge da Famiglia Esistente' +exec voc.stp_insNewLemma 'StatoDossiers', 'Stato Dossiers' +exec voc.stp_insNewLemma 'StatoCollaudi', 'Stato Collaudi' + + + +-- permessi & funzioni +INSERT INTO dbo.Permessi(COD_PERMESSO,URL,GRUPPO,NUMERO,NOME,DESCRIZIONE) VALUES ('Collaudi_StatoDossiers','StatoDossiers',2,4,'StatoDossiers','StatoDossiersIcon') +INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoOfficina', 'S') +INSERT INTO dbo.Permessi2Funzione(COD_PERMESSO,COD_FUNZIONE,READWRITE) VALUES('Collaudi_StatoDossiers', 'CapoGruppo', 'S') + +-- genero calcolo x valori ordinali ATTUALI +exec util.stp_setupOrdinal_SCFM +SELECT ROW_NUMBER() OVER(PARTITION BY CodFam ORDER BY CodScheda, Vers) AS Riga, * +FROM SchemaCollFamMacc + +exec util.stp_setupOrdinal_SCM +SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier ORDER BY CodScheda, Vers, NumScheda) AS Riga, * +FROM SchemaCollMacc + + +exec util.stp_setupOrdinal_Mis +SELECT ROW_NUMBER() OVER(PARTITION BY IdxDossier, Fase ORDER BY CodScheda, Vers, NumScheda, CodMisura) AS Riga, * +FROM Misure diff --git a/VersGen/CMS_SC.cs b/VersGen/CMS_SC.cs index 4e758fa..4a28c06 100644 --- a/VersGen/CMS_SC.cs +++ b/VersGen/CMS_SC.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.129.360")] -[assembly: AssemblyFileVersion("2.0.129.360")] +[assembly: AssemblyVersion("2.1.132.360")] +[assembly: AssemblyFileVersion("2.1.132.360")] [assembly: AssemblyCopyright("Steamware © 2009-2015")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/CMS_SC.tt b/VersGen/CMS_SC.tt index 76d6d6d..66fc67d 100644 --- a/VersGen/CMS_SC.tt +++ b/VersGen/CMS_SC.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.0.129.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.0.129.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.1.132.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.1.132.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2009-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+