Completata gestione fase B3 x v_2.1

Installato su IIS01/IIS02 e winlab
Generato installer CMS (zip)
This commit is contained in:
Samuele E. Locatelli
2015-12-01 15:05:48 +01:00
parent 3e177e1fa7
commit 5bafd9d410
19 changed files with 147 additions and 37 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -322,6 +322,7 @@
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
<None Include="Properties\PublishProfiles\IIS01.pubxml" />
<None Include="Properties\PublishProfiles\WinLab.pubxml" />
<None Include="Properties\PublishProfiles\ZIP-CMS.pubxml" />
<None Include="Scripts\jquery-2.1.4.intellisense.js" />
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS01:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/CMS_SC</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>steamw\administrator</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
<ObjectGroup Name="CMS_SC_Data.Properties.Settings.CMS_SCConnectionString" Order="1" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=CMS-SC;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\CMS_SC_Data.Properties.Settings.CMS_SCConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=CMS-SC;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
<ObjectGroup Name="SteamWare.Properties.Settings.DS_AuthConnectionString" Order="2" Enabled="False">
<Destination Path="" />
<Object Type="DbDacFx">
<PreSource Path="Data Source=SQL-STEAM\SQL2012;Initial Catalog=CMS-SC;Persist Security Info=True;User ID=sa;Password=keyhammer" includeData="False" />
<Source Path="$(IntermediateOutputPath)AutoScripts\SteamWare.Properties.Settings.DS_AuthConnectionString_IncrementalSchemaOnly.dacpac" dacpacAction="Deploy" />
</Object>
<UpdateFrom Type="Web.Config">
<Source MatchValue="Data Source=SQL-STEAM\SQL2012;Initial Catalog=CMS-SC;Persist Security Info=True;User ID=sa;Password=keyhammer" MatchAttributes="$(UpdateFromConnectionStringAttributes)" />
</UpdateFrom>
</ObjectGroup>
</Objects>
</PublishDatabaseSettings>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)CMS_SC_Data.Properties.Settings.CMS_SCConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
<MSDeployParameterValue Include="$(DeployParameterPrefix)SteamWare.Properties.Settings.DS_AuthConnectionString-Web.config Connection String">
<UpdateDestWebConfig>False</UpdateDestWebConfig>
</MSDeployParameterValue>
</ItemGroup>
</Project>
@@ -10,14 +10,14 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>https://IIS02:8172/MsDeploy.axd</MSDeployServiceURL>
<DeployIisAppPath>Default Web Site/CMS_SC</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>steamwarewin\administrator</UserName>
<UserName>steamw\administrator</UserName>
<_SavePWD>True</_SavePWD>
<PublishDatabaseSettings>
<Objects xmlns="">
@@ -44,6 +44,10 @@ by editing this MSBuild file. In order to learn more about this please visit htt
</Objects>
</PublishDatabaseSettings>
<ADUsesOwinOrOpenIdConnect>False</ADUsesOwinOrOpenIdConnect>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>DonotMerge</WDPMergeOption>
</PropertyGroup>
<ItemGroup>
<MSDeployParameterValue Include="$(DeployParameterPrefix)CMS_SC_Data.Properties.Settings.CMS_SCConnectionString-Web.config Connection String">
+10
View File
@@ -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");
}
/// <summary>
/// cerca di recuperare i 3 parametri selezionati dall'utente (SE ci sono su DB)
/// </summary>
@@ -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();
}
}
/// <summary>
/// salva su DB il parametro scelto dall'utente
/// </summary>
/// <param name="paramName"></param>
/// <param name="paramValue"></param>
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();
Binary file not shown.
Binary file not shown.
Binary file not shown.
+19 -28
View File
@@ -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')
Binary file not shown.
+33
View File
@@ -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
+2 -2
View File
@@ -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")]
+2 -2
View File
@@ -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")]
<#+