Sistemata visualizzazione storici (precedenti) delel scehde

This commit is contained in:
Samuele E. Locatelli
2015-09-10 18:31:55 +02:00
parent 491271a1a5
commit 8fac3ce451
16 changed files with 167 additions and 27 deletions
Binary file not shown.
Binary file not shown.
Binary file not shown.
+9 -6
View File
@@ -48,7 +48,7 @@
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<!-- Fixed navbar -->
<div class="navbar navbar-fixed-top" role="navigation">
<div class="navbar navbar-fixed-top" role="navigation" style="background-color: white;">
<div class="container-fluid" style="padding: 0px;">
<uc1:mod_testata runat="server" ID="mod_testata" />
</div>
@@ -77,22 +77,25 @@
<asp:Timer ID="Timer1" runat="server" Interval="10000" OnTick="Timer1_Tick">
</asp:Timer>
<footer>
<%--<div class="navbar navbar-inverse navbar-fixed-bottom" role="navigation" style="border-top: 1px solid #ABABAB; padding: 2px 0px;">--%>
<%--<div class="navbar navbar-inverse navbar-fixed-bottom" role="navigation" style="border-top: 1px solid #ABABAB; padding: 2px 0px;">--%>
<%--<div class="navbar navbar-inverse" role="navigation" style="border-top: 1px solid #ABABAB; padding: 2px 0px;">--%>
<div class="navbar navbar-fixed-bottom" role="navigation" style="border-top: 1px solid #ABABAB; padding: 0px;">
<div class="navbar navbar-fixed-bottom" role="navigation" style="border-top: 1px solid #ABABAB; padding: 0px; background-color: white;">
<div class="container-fluid">
<div class="navbar-text navbar-left" style="margin: 0px;"> <%--margin da togliere in prod!--%>
<div class="navbar-text navbar-left" style="margin: 0px;">
<%--margin da togliere in prod!--%>
<asp:Label ID="lblVers" runat="server" />
&copy; 2008-<%: DateTime.Now.Year %>&nbsp;|&nbsp;
<asp:Label runat="server" ID="lblDateTime"><%: DateTime.Now %></asp:Label>
</div>
<div class="navbar-text navbar-right" style="margin: 0px;"> <%--margin da togliere in prod!--%>
<div class="navbar-text navbar-right" style="margin: 0px;">
<%--margin da togliere in prod!--%>
Powered by <a href="http://www.steamware.net" target="_blank">
<img src="Images/logoSteamware.png" alt="Steamware" height="18" />
<%--<img src="Images/logoSteamware.png" alt="Steamware" height="24" />--%>
</a>
</div>
<div class="navbar-text navbar-right" style="margin: 0px;"> <%--margin da togliere in prod!--%>
<div class="navbar-text navbar-right" style="margin: 0px;">
<%--margin da togliere in prod!--%>
<asp:UpdateProgress ID="updtRicerca" runat="server" DisplayAfter="5" DynamicLayout="false">
<ProgressTemplate>
<div id="progress_back">
+3
View File
@@ -187,6 +187,9 @@
<DependentUpon>font.less</DependentUpon>
</Content>
<Content Include="Content\Site.css" />
<Content Include="Content\Site.min.css">
<DependentUpon>Site.css</DependentUpon>
</Content>
<Content Include="Content\Style.css">
<DependentUpon>Style.less</DependentUpon>
</Content>
+4 -4
View File
@@ -53,7 +53,7 @@
</div>
</div>
<div class="col-xs-12 panel-body">
<uc1:mod_collaudi runat="server" ID="mod_collaudi" />
<uc1:mod_collaudi runat="server" ID="mod_collaudi" editEnabled="true" />
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
@@ -70,7 +70,7 @@
</div>
<div class="row" style="font-size: 0.8em;">
<div class="col-xs-6">
<asp:DropDownList runat="server" ID="ddlFasePrev" DataSourceID="odsFasePrev" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFase_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
<asp:DropDownList runat="server" ID="ddlFasePrev" DataSourceID="odsFasePrev" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlFasePrev_SelectedIndexChanged" OnDataBound="ddlFase_DataBound">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsFasePrev" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getPrev" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter">
<SelectParameters>
@@ -80,7 +80,7 @@
</div>
<div class="col-xs-6">
<div style="width: 100%; float: left;">
<asp:DropDownList runat="server" ID="ddlSelSchedaPrev" DataSourceID="odsSchedaPrev" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlSelScheda_SelectedIndexChanged" Width="100%"></asp:DropDownList>
<asp:DropDownList runat="server" ID="ddlSelSchedaPrev" DataSourceID="odsSchedaPrev" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlSelSchedaPrev_SelectedIndexChanged" Width="100%"></asp:DropDownList>
<asp:ObjectDataSource ID="odsSchedaPrev" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByConditio" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selSchedaTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="ddlDossier" Name="conditio" PropertyName="SelectedValue" Type="Int32" />
@@ -91,7 +91,7 @@
</div>
</div>
<div class="col-xs-12 panel-body">
<uc1:mod_collaudi runat="server" ID="mod_collaudiPrev" />
<uc1:mod_collaudi runat="server" ID="mod_collaudiPrev" editEnabled="false" />
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag runat="server" ID="mod_righePagPrev" />
+64 -1
View File
@@ -16,20 +16,33 @@ namespace CMS_SC
if (!Page.IsPostBack)
{
((Bootstrap)this.Master).showSearch = true;
mod_righePag.numRowPag = 20;
// pannello principale
mod_righePag.numRowPag = 10;
mod_collaudi.pageSize = mod_righePag.numRowPag;
// pannello secondario
mod_righePagPrev.numRowPag = 20;
mod_collaudiPrev.pageSize = mod_righePagPrev.numRowPag;
// collego ed aggiorno resto...
ddlFase.DataBind();
ddlDossier.DataBind();
ddlSelScheda.DataBind();
//ddlFasePrev.DataBind();
//ddlSelSchedaPrev.DataBind();
fixControls();
fixControlsPrev();
}
mod_righePag.eh_newNum += mod_righePag_eh_newNum;
mod_righePagPrev.eh_newNum += mod_righePagPrev_eh_newNum;
//mod_collaudi.eh_selezioneValore += mod_collaudi_eh_selezioneValore;
}
void mod_righePag_eh_newNum(object sender, EventArgs e)
{
mod_collaudi.pageSize = mod_righePag.numRowPag;
}
void mod_righePagPrev_eh_newNum(object sender, EventArgs e)
{
mod_collaudiPrev.pageSize = mod_righePagPrev.numRowPag;
}
void mod_collaudi_eh_selezioneValore(object sender, EventArgs e)
{
fixControls();
@@ -67,6 +80,14 @@ namespace CMS_SC
}
}
}
private void fixControlsPrev()
{
// sistemo dati storici
mod_collaudiPrev.IdxDossier = IdxDossier;
mod_collaudiPrev.CodSchedaVers = CodSchedaVersPrev;
mod_collaudiPrev.Fase = FasePrev;
mod_collaudiPrev.doUpdate();
}
protected int IdxDossier
{
get
@@ -113,6 +134,38 @@ namespace CMS_SC
return answ;
}
}
protected string CodSchedaVersPrev
{
get
{
string answ = "-";
try
{
answ = ddlSelSchedaPrev.SelectedValue;
}
catch
{
answ = "-";
}
return answ;
}
}
protected string FasePrev
{
get
{
string answ = "-";
try
{
answ = ddlFasePrev.SelectedValue;
}
catch
{
answ = "-";
}
return answ;
}
}
protected void ddlDossier_SelectedIndexChanged(object sender, EventArgs e)
{
@@ -129,6 +182,16 @@ namespace CMS_SC
ddlSelScheda.DataBind();
fixControls();
}
protected void ddlSelSchedaPrev_SelectedIndexChanged(object sender, EventArgs e)
{
fixControlsPrev();
}
protected void ddlFasePrev_SelectedIndexChanged(object sender, EventArgs e)
{
ddlSelSchedaPrev.DataBind();
fixControlsPrev();
}
/// <summary>
/// wrapper traduzione
/// </summary>
+1
View File
File diff suppressed because one or more lines are too long
+4 -6
View File
@@ -15,20 +15,14 @@
- In Dossier la singola SC deve avere descrizione MODIFICABILE
- gestione template fasi da tabellone?
- allegati FILE (db? fs?)
- In fase di definizione delle famiglie, poter dire per ciascuna scheda, in quale fase deve finire. In questo modo quando creo nuova scheda macchina, indicandone il modello nelle varie fasi mi trovo già le schede di collaudo previste. Struttura come FCS; ovvero campo testo; separatore da web.config, x cui 001#002#003 --> fasi 001, 002, 003 (magari cambiare fasia 2 digit..)
- Potrebbero servire schede speciali in cui i valori di Minimo e Massimo sono variabili (tolleranze variabili a FDO) -> si è deciso con Carlo di costruire delle schede con 2 valori TESTUALI + un file allegato, x cui misura 1 = valori massimi da ORDINE, misura 2 valori massimi rilevati, misura 3 OK / KO (con deroga...), misura 4 = allegato file
- Fare in modo che l'applicativo permetta anche la consultazione delle schede DT,( ed in generale di tutta la documentazione a corredo che non sia schede) --> creazione di FASE 000 = allegati tecnici, che contiene link a documenti da consultare
- in generale F1 = help del significato delle varie Icone. --> TOOLTIP
- selezione multipla delle schede ( es. cancellazione dal dossier ) --> inserire selezione con checkbox
@@ -37,6 +31,7 @@
- chiusura parziale della fase ???? alla partenza si chiude certamente una fase, poi la macchina passa in carico ad altro ente ( installazione, assistenza )
fasi curate da Mario Volpi : - montaggio meccanico
- avviamento
- allegati FILE (su DB come link)
----------------------------------------------------------------------------------------------------------------
@@ -59,4 +54,7 @@ CANCELLAZIONE DOSSIER
NOTE su dossier: creato UNICO x tutto dossier (lunghezza indefinita...)
- Campo note NEL DOSSIER per ciascuna fase (montaggio, avviamento, collaudo, .. ) per poter indicare alcune segnalazioni (rifatto perchè sbattuto, aggiunta scheda XXXX perchè ....); (campo a commento libero).
GESTIONE allegati e storico misure (prev)
- Fare in modo che l'applicativo permetta anche la consultazione delle schede DT,( ed in generale di tutta la documentazione a corredo che non sia schede) --> creazione di FASE 000 = allegati tecnici, che contiene link a documenti da consultare
................................................................................................................
+30 -10
View File
@@ -10,7 +10,7 @@
&nbsp;<asp:LinkButton ID="lbCancel" runat="server" CausesValidation="False" CommandName="Cancel" ToolTip="Cancel" CssClass="fa fa-undo fa-2x" />
</EditItemTemplate>
<ItemTemplate>
<asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" />
<asp:LinkButton ID="lbEdit" runat="server" CausesValidation="False" CommandName="Edit" ToolTip="Edit" CssClass="fa fa-edit fa-2x" Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="CodSchedaVersNum" HeaderText="Scheda" ReadOnly="True" SortExpression="CodSchedaVersNum" />
@@ -26,25 +26,44 @@
<asp:Label ID="lblLS_ValMis" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("LIVal"),Eval("LSVal")) %>' Visible='<%# Eval("NomePar")!="" %>' Font-Size="0.8em" ForeColor="#696969" />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Nome Par." SortExpression="NomePar">
<asp:TemplateField>
<EditItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadNomePar" Text="Param." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Val. Par." SortExpression="ValorePar">
<asp:TemplateField>
<EditItemTemplate>
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblValorePar" runat="server" Text='<%# Eval("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<br />
<asp:Label ID="lblLS_ValPar" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("MinPar"),Eval("MaxPar")) %>' Visible='<%# Eval("NomePar")!="" %>' Font-Size="0.8em" ForeColor="#696969" />
<div runat="server" id="divValPar" visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>'>
<asp:Label ID="lblValorePar" runat="server" Text='<%# Eval("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
<br />
<asp:Label ID="lblLS_ValPar" runat="server" Text='<%# string.Format("({0} ÷ {1})",Eval("MinPar"),Eval("MaxPar")) %>' Visible='<%# Eval("NomePar")!="" %>' Font-Size="0.8em" ForeColor="#696969" />
</div>
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadValPar" Text="Vis." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Val.Par." SortExpression="CodVisib">
<EditItemTemplate>
<asp:TextBox ID="txtCodVisib" runat="server" Text='<%# Bind("CodVisib") %>' />
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="lblCodVisib" runat="server" Text='<%# Bind("CodVisib") %>' Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</ItemTemplate>
<HeaderTemplate>
<asp:Label runat="server" ID="lblHeadVis" Text="Vis." Visible='<%# Convert.ToBoolean(hfEditEnabled.Value) %>' />
</HeaderTemplate>
<ControlStyle Width="4em" />
</asp:TemplateField>
<asp:BoundField DataField="CodVisib" HeaderText="Visib." SortExpression="CodVisib" ControlStyle-Width="4em" />
<asp:TemplateField HeaderText="Oper." SortExpression="Operatore">
<EditItemTemplate>
<asp:Label ID="lblOperatore" runat="server" Text='<%# Eval("Operatore") %>' />
@@ -59,11 +78,11 @@
<i id="iKO" runat="server" class="fa fa-times-circle fa-2x" visible='<%# !Convert.ToBoolean(Eval("OkValMis")) && Eval("Operatore")!="" %>' style="color: red;"></i>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Deroga" SortExpression="CodDeroga">
<asp:TemplateField HeaderText="Der." SortExpression="CodDeroga">
<ItemTemplate>
<asp:LinkButton id="lbCodDerogaAdd" CausesValidation="False" CommandName="Select" CommandArgument="ADD" runat="server" class="fa fa-plus-circle fa-2x" visible='<%# hasDeroga("ADD", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" %>' style="color: green;"></asp:LinkButton>
<asp:LinkButton ID="lbCodDerogaAdd" CausesValidation="False" CommandName="Select" CommandArgument="ADD" runat="server" class="fa fa-plus-circle fa-2x" Visible='<%# hasDeroga("ADD", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" %>' Style="color: green;"></asp:LinkButton>
<asp:Label ID="lblCodDeroga" class="fa fa-graduation-cap fa-2x" runat="server" ToolTip='<%# Eval("CodDeroga") %>' Visible='<%# Eval("CodDeroga")!="" %>' ForeColor="Green" />
<asp:LinkButton id="lbCodDerogaRem" CausesValidation="False" CommandName="Select" CommandArgument="REM" runat="server" class="fa fa-minus-circle fa-2x" visible='<%# hasDeroga("REM", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" %>' style="color: red;"></asp:LinkButton>
<asp:LinkButton ID="lbCodDerogaRem" CausesValidation="False" CommandName="Select" CommandArgument="REM" runat="server" class="fa fa-minus-circle fa-2x" Visible='<%# hasDeroga("REM", Eval("CodDeroga"), Eval("OkValMis")) && Eval("Operatore")!="" && Convert.ToBoolean(hfEditEnabled.Value) %>' Style="color: red;"></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
@@ -103,3 +122,4 @@
<asp:HiddenField runat="server" ID="hfIdxDossier" Value="0" />
<asp:HiddenField runat="server" ID="hfCodSchedaVers" Value="" />
<asp:HiddenField runat="server" ID="hfFase" Value="" />
<asp:HiddenField runat="server" ID="hfEditEnabled" Value="" />
@@ -189,5 +189,24 @@ namespace CMS_SC.WebUserControls
// salvo il command argument...
lastCmd = e.CommandArgument.ToString();
}
public bool editEnabled
{
get
{
bool answ = false;
try
{
answ = Convert.ToBoolean(hfEditEnabled.Value);
}
catch
{ }
return answ;
}
set
{
hfEditEnabled.Value = value.ToString();
}
}
}
}
+9
View File
@@ -56,5 +56,14 @@ namespace CMS_SC.WebUserControls {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfFase;
/// <summary>
/// hfEditEnabled 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.HiddenField hfEditEnabled;
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
+24
View File
@@ -34,5 +34,29 @@
"inputFiles": [
"Content/font-awesome.css"
]
},
{
"outputFileName": "Content/Site.css",
"inputFiles": [
"Content/Site.css"
]
},
{
"outputFileName": "Content/font-awesome.css",
"inputFiles": [
"Content/font-awesome.css"
]
},
{
"outputFileName": "Content/bootstrap.css",
"inputFiles": [
"Content/bootstrap.css"
]
},
{
"outputFileName": "Content/bootstrap-theme.css",
"inputFiles": [
"Content/bootstrap-theme.css"
]
}
]