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

iniziato integrazione stato schede

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-04-01 10:32:31 +02:00
parent 2b99ee602e
commit a3a1a4e634
16 changed files with 210 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/config/applicationhost.config
-1
View File
@@ -167,7 +167,6 @@
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56229:localhost" />
<binding protocol="https" bindingInformation="*:44300:localhost" />
</bindings>
</site>
<siteDefaults>
CMS-SC-Data/CMS-SC-Data.csproj
+3 -1
View File
@@ -95,6 +95,7 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
<None Include="SchemaComp_DevelopProd.scmp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\SteamWareLibrary\SteamWare\SteamWare.csproj">
@@ -102,8 +103,9 @@
<Name>SteamWare</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="UpdateSql\" />
<Content Include="UpdateSql\CMS-SC_2.1.132.sql" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
CMS-SC-Data/bin/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Release/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/CMS_SC.csproj
+2 -1
View File
@@ -15,7 +15,8 @@
<AssemblyName>CMS_SC</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<UseIISExpress>true</UseIISExpress>
<IISExpressSSLPort>44300</IISExpressSSLPort>
<IISExpressSSLPort>
</IISExpressSSLPort>
<IISExpressAnonymousAuthentication />
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
CMS_SC/Collaudi.aspx
+39 -7
View File
@@ -2,6 +2,8 @@
<%@ Register Src="~/WebUserControls/mod_collaudi.ascx" TagPrefix="uc1" TagName="mod_collaudi" %>
<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %>
<%@ Register Src="~/WebUserControls/mod_StatoCollaudi.ascx" TagPrefix="uc1" TagName="mod_StatoCollaudi" %>
@@ -11,8 +13,38 @@
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container-flow">
<div class="row" style="margin: 0px 5px;">
<div runat="server" id="divMain" class="col-xs-7">
<div class="row" style="margin: 0 5px;">
<div runat="server" id="divStato" class="col-xs-4" style="font-size: 0.8em;">
<div class="row panel panel-info">
<div class="panel-heading">
<div class="row">
<div class="col-xs-12">
<h4 class="panel-title"><%: traduci("StatoCollaudi") %></h4>
</div>
<div class="col-xs-6">
<asp:DropDownList runat="server" ID="ddlDossier" DataSourceID="odsDossier" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlDossier_SelectedIndexChanged"></asp:DropDownList>
<asp:ObjectDataSource ID="odsDossier" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selElencoDossierTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="ddlFase" Name="conditio" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div class="col-xs-6">
<asp:DropDownList runat="server" ID="ddlFase" DataSourceID="odsFase" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>
</div>
</div>
</div>
<div class="col-xs-12 panel-body">
<uc1:mod_StatoCollaudi runat="server" ID="mod_StatoCollaudi" />
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag runat="server" ID="mod_righePagStato" />
</div>
</div>
</div>
<div runat="server" id="divMain" class="col-xs-4">
<div class="row panel panel-default">
<div class="panel-heading">
<div class="row">
@@ -31,17 +63,17 @@
</div>
<div class="row" style="font-size: 0.8em;">
<div class="col-xs-3">
<asp:DropDownList runat="server" ID="ddlFase" DataSourceID="odsFase" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
<%--<asp:DropDownList runat="server" ID="ddlFase" DataSourceID="odsFase" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>
<asp:ObjectDataSource ID="odsFase" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>--%>
</div>
<div class="col-xs-4">
<asp:DropDownList runat="server" ID="ddlDossier" DataSourceID="odsDossier" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlDossier_SelectedIndexChanged"></asp:DropDownList>
<%--<asp:DropDownList runat="server" ID="ddlDossier" DataSourceID="odsDossier" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlDossier_SelectedIndexChanged"></asp:DropDownList>
<asp:ObjectDataSource ID="odsDossier" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selElencoDossierTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="ddlFase" Name="conditio" PropertyName="SelectedValue" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</asp:ObjectDataSource>--%>
</div>
<div class="col-xs-5">
<div style="width: 90%; float: left;">
@@ -66,7 +98,7 @@
</div>
</div>
</div>
<div runat="server" id="divHist" class="col-xs-5" style="font-size: 0.9em;">
<div runat="server" id="divHist" class="col-xs-4" style="font-size: 0.8em;">
<div class="row panel panel-warning">
<div class="panel-heading">
<div class="row">
CMS_SC/Collaudi.aspx.cs
+77 -33
View File
@@ -17,44 +17,62 @@ namespace CMS_SC
{
((Bootstrap)this.Master).showSearch = true;
memLayer.ML.setSessionVal("showHist", false);
// pannello principale
mod_righePag.numRowPag = 10;
if (getPar("numRowPagColl_Main") != "")
{
try
{
mod_righePag.numRowPag = Convert.ToInt32(getPar("numRowPagColl_Main"));
}
catch
{ }
}
mod_collaudi.pageSize = mod_righePag.numRowPag;
// pannello secondario
mod_righePagPrev.numRowPag = 20;
if (getPar("numRowPagColl_Sec") != "")
{
try
{
mod_righePagPrev.numRowPag = Convert.ToInt32(getPar("numRowPagColl_Sec"));
}
catch
{ }
}
mod_collaudiPrev.pageSize = mod_righePagPrev.numRowPag;
fixPaginazione();
tryGetParam();
//// collego ed aggiorno resto...
//ddlFase.DataBind();
//ddlDossier.DataBind();
//ddlSelScheda.DataBind();
fixControls();
fixControlsPrev();
}
mod_righePagStato.eh_newNum += mod_righePagStato_eh_newNum;
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
mod_righePagPrev.eh_newNum += mod_righePagPrev_eh_newNum;
}
/// <summary>
/// sistemazione controlli paginazione
/// </summary>
private void fixPaginazione()
{
// pannello stato schede
mod_righePagStato.numRowPag = 10;
if (getPar("numRowPagColl_Stato") != "")
{
try
{
mod_righePagStato.numRowPag = Convert.ToInt32(getPar("numRowPagColl_Stato"));
}
catch
{ }
}
mod_StatoCollaudi.pageSize = mod_righePagStato.numRowPag;
// pannello principale
mod_righePag.numRowPag = 10;
if (getPar("numRowPagColl_Main") != "")
{
try
{
mod_righePag.numRowPag = Convert.ToInt32(getPar("numRowPagColl_Main"));
}
catch
{ }
}
mod_collaudi.pageSize = mod_righePag.numRowPag;
// pannello secondario
mod_righePagPrev.numRowPag = 20;
if (getPar("numRowPagColl_Sec") != "")
{
try
{
mod_righePagPrev.numRowPag = Convert.ToInt32(getPar("numRowPagColl_Sec"));
}
catch
{ }
}
mod_collaudiPrev.pageSize = mod_righePagPrev.numRowPag;
}
/// <summary>
/// cerca di recuperare i 3 parametri selezionati dall'utente (SE ci sono su DB)
/// </summary>
private void tryGetParam()
@@ -66,6 +84,8 @@ namespace CMS_SC
try
{
ddlFase.SelectedValue = getPar("ddlFase");
// imposto selezione x maschera resoconto stato
mod_StatoCollaudi.Fase = Fase;
}
catch
{
@@ -79,6 +99,8 @@ namespace CMS_SC
try
{
ddlDossier.SelectedValue = getPar("ddlDossier");
// imposto selezione x maschera resoconto stato
mod_StatoCollaudi.idxDossier = IdxDossier.ToString();
}
catch
{
@@ -125,6 +147,11 @@ namespace CMS_SC
{
DtProxy.man.taUsrPar.upsert(OpAuth.currAuth.email, paramName, paramValue);
}
private void mod_righePagStato_eh_newNum(object sender, EventArgs e)
{
savePar("numRowPagColl_Stato", mod_righePagStato.numRowPag.ToString());
mod_StatoCollaudi.pageSize = mod_righePagStato.numRowPag;
}
void mod_righePag_eh_newNum(object sender, EventArgs e)
{
savePar("numRowPagColl_Main", mod_righePag.numRowPag.ToString());
@@ -149,6 +176,12 @@ namespace CMS_SC
btnAddNewSetMis.Visible = addNewVisible;
btnRemSetMis.DataBind();
btnRemSetMis.Visible = !addNewVisible && remMisVisible; // non devo inserire nulla e non ho nessuna misura inserita...
// aggiorno modulo stato..
mod_StatoCollaudi.Fase = Fase;
mod_StatoCollaudi.idxDossier = IdxDossier.ToString();
// aggiorno modulo collaudi
mod_collaudi.IdxDossier = IdxDossier;
mod_collaudi.CodSchedaVers = CodSchedaVers;
mod_collaudi.Fase = Fase;
@@ -177,13 +210,16 @@ namespace CMS_SC
}
private void fixControlsPrev()
{
// tolgo css a blococ main
// aggiorno modulo stato..
mod_StatoCollaudi.idxDossier = IdxDossier.ToString();
mod_StatoCollaudi.Fase = Fase;
// tolgo css a blocco main
divMain.Attributes.Remove("class");
// verifico SE devo mostrare storico...
if (showHist)
{
// imposto css x mostrare 2 blocchi
divMain.Attributes.Add("class", "col-xs-7");
divMain.Attributes.Add("class", "col-xs-4");
btnShowHideHist.Text = traduci("btnHideHist");
divHist.Visible = true;
// sistemo dati storici
@@ -195,7 +231,7 @@ namespace CMS_SC
else
{
// imposto css x mostrare solo blocco corrente e nascondo altro...
divMain.Attributes.Add("class", "col-xs-12");
divMain.Attributes.Add("class", "col-xs-8");
btnShowHideHist.Text = traduci("btnShowHist");
divHist.Visible = false;
}
@@ -216,6 +252,10 @@ namespace CMS_SC
}
return answ;
}
set
{
ddlDossier.SelectedValue = value.ToString();
}
}
protected string CodSchedaVers
{
@@ -248,6 +288,10 @@ namespace CMS_SC
}
return answ;
}
set
{
ddlFase.SelectedValue = value;
}
}
protected string CodSchedaVersPrev
{
CMS_SC/Collaudi.aspx.designer.cs
Generated
+63 -36
View File
@@ -12,6 +12,69 @@ namespace CMS_SC {
public partial class Collaudi {
/// <summary>
/// divStato control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divStato;
/// <summary>
/// ddlDossier control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlDossier;
/// <summary>
/// odsDossier control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsDossier;
/// <summary>
/// ddlFase control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlFase;
/// <summary>
/// odsFase control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsFase;
/// <summary>
/// mod_StatoCollaudi control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::CMS_SC.WebUserControls.mod_StatoCollaudi mod_StatoCollaudi;
/// <summary>
/// mod_righePagStato control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_righePag mod_righePagStato;
/// <summary>
/// divMain control.
/// </summary>
@@ -57,42 +120,6 @@ namespace CMS_SC {
/// </remarks>
protected global::System.Web.UI.WebControls.Button btnShowHideHist;
/// <summary>
/// ddlFase control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlFase;
/// <summary>
/// odsFase control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsFase;
/// <summary>
/// ddlDossier control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlDossier;
/// <summary>
/// odsDossier control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsDossier;
/// <summary>
/// ddlSelScheda control.
/// </summary>
CMS_SC/StatoDossiers.aspx.cs
+21 -6
View File
@@ -27,16 +27,31 @@ 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;
mod_StatoCollaudi.eh_ucev += Mod_StatoCollaudi_eh_ucev;
}
private void Mod_StatoCollaudi_eh_selezioneValore(object sender, EventArgs e)
private void Mod_StatoCollaudi_eh_ucev(object sender, EventArgs e)
{
// salvo parametri
savePar("ddlDossier", mod_elencoDossiers.idxDossier.ToString());
// rimando a dettaglio...
Response.Redirect("Collaudi");
ucEvent evento = (ucEvent)e;
// in base a tipo evento reagisco
switch (evento.tipoEvento)
{
case ucEvType.Selected:
// salvo parametri
savePar("ddlDossier", mod_elencoDossiers.idxDossier.ToString());
// rimando a dettaglio...
Response.Redirect("Collaudi");
break;
case ucEvType.Delete:
case ucEvType.Edit:
case ucEvType.New:
case ucEvType.Reset:
case ucEvType.ReqUpdateParent:
default:
break;
}
}
/// <summary>
/// cerca di recuperare i 3 parametri selezionati dall'utente (SE ci sono su DB)
CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs
+3 -17
View File
@@ -11,21 +11,7 @@ namespace CMS_SC.WebUserControls
{
public partial class mod_StatoCollaudi : SteamWare.UserControl
{
/// <summary>
/// selezione valore in DettScheda
/// </summary>
public event EventHandler eh_selezioneValore;
/// <summary>
/// sollevo evento selezione
/// </summary>
protected void raiseEvent()
{
// sollevo evento nuovo valore...
if (eh_selezioneValore != null)
{
eh_selezioneValore(this, new EventArgs());
}
}
protected void Page_Load(object sender, EventArgs e)
{
@@ -93,7 +79,7 @@ namespace CMS_SC.WebUserControls
// salvo parametro
savePar("ddlSelScheda", CodSchedaVersNum);
// sollevo evento...
raiseEvent();
raiseEvent(ucEvType.Selected);
}
}
/// <summary>
@@ -116,7 +102,7 @@ namespace CMS_SC.WebUserControls
{
grView.SelectedIndex = -1;
grView.DataBind();
raiseEvent();
raiseEvent(ucEvType.Reset);
}
}
}
CMS_SC/WebUserControls/mod_collaudi.ascx
+2 -2
View File
@@ -88,7 +88,7 @@
<asp:Label runat="server" ID="lblHeadValPar" Text="Val.Par." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Oper." SortExpression="Operatore">
<asp:TemplateField HeaderText="Op." SortExpression="Operatore">
<EditItemTemplate>
<asp:Label ID="lblOperatore" runat="server" Text='<%# Eval("Operatore") %>' />
</EditItemTemplate>
@@ -96,7 +96,7 @@
<asp:Label ID="lblOperatore" class="fa fa-user" Font-Size="1.5em" runat="server" ToolTip='<%# string.Format("{0} - {1:yyyy/MM/dd HH:mm}", Eval("Operatore"), Eval("DataOra")) %>' Visible='<%# Eval("Operatore").ToString() != "" %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Ok Mis." SortExpression="OkValMis">
<asp:TemplateField HeaderText="Ok" SortExpression="OkValMis">
<ItemTemplate>
<i id="iOK" runat="server" class="fa fa-check-circle" font-size="1.5em" visible='<%# Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore").ToString()!="" %>' style="color: green;"></i>
<i id="iKO" runat="server" class="fa fa-times-circle" font-size="1.5em" visible='<%# !Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore").ToString()!="" %>' style="color: red;"></i>
CMS_SC/bin/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/CMS_SC.dll
BIN
View File
Binary file not shown.
CMS_SC/bin/SteamWare.dll
BIN
View File
Binary file not shown.
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.