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

Fix colori ricompilando css

Browse Source 
Iniziata review scheda collaudi con "storico" a fianco dx
This commit is contained in:
Samuele E. Locatelli
2015-09-10 17:44:35 +02:00
parent 50969bdd3c
commit 9f3a79b2e5
20 changed files with 163 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS-SC-Data/bin/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
CMS-SC-Data/obj/Debug/CMS-SC-Data.dll
BIN
View File
Binary file not shown.
CMS_SC/Bootstrap.Master
+2 -2
View File
@@ -48,7 +48,7 @@
<asp:UpdatePanel ID="uppNavbar" runat="server">
<ContentTemplate>
<!-- Fixed navbar -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="navbar navbar-fixed-top" role="navigation">
<div class="container-fluid" style="padding: 0px;">
<uc1:mod_testata runat="server" ID="mod_testata" />
</div>
@@ -79,7 +79,7 @@
<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" 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: 0px;">
<div class="navbar navbar-fixed-bottom" role="navigation" style="border-top: 1px solid #ABABAB; padding: 0px;">
<div class="container-fluid">
<div class="navbar-text navbar-left" style="margin: 0px;"> <%--margin da togliere in prod!--%>
<asp:Label ID="lblVers" runat="server" />
CMS_SC/CMS_SC.csproj
+11 -4
View File
@@ -163,17 +163,23 @@
<Content Include="App_Readme\Elmah.txt" />
<Content Include="Collaudi.aspx" />
<Content Include="Content\bootstrap-theme.css" />
<Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap-theme.min.css">
<DependentUpon>bootstrap-theme.css</DependentUpon>
</Content>
<Content Include="Content\bootstrap.css" />
<Content Include="Content\bootstrap.min.css" />
<Content Include="Content\bootstrap.min.css">
<DependentUpon>bootstrap.css</DependentUpon>
</Content>
<Content Include="Content\bootswatch.css">
<DependentUpon>bootswatch.less</DependentUpon>
</Content>
<Content Include="Content\bootswatch.min.css">
<DependentUpon>bootswatch.less</DependentUpon>
<DependentUpon>bootswatch.css</DependentUpon>
</Content>
<Content Include="Content\font-awesome.css" />
<Content Include="Content\font-awesome.min.css" />
<Content Include="Content\font-awesome.min.css">
<DependentUpon>font-awesome.css</DependentUpon>
</Content>
<Content Include="Content\font.css">
<DependentUpon>font.less</DependentUpon>
</Content>
@@ -290,6 +296,7 @@
<Content Include="Reports\Report_C.rdl" />
<Content Include="Reports\Report_S.rdl" />
<Content Include="Reports\Report_F.rdl" />
<None Include="bundleconfig.json" />
<None Include="compilerconfig.json" />
<Content Include="compilerconfig.json.defaults">
<DependentUpon>compilerconfig.json</DependentUpon>
CMS_SC/Collaudi.aspx
+72 -40
View File
@@ -10,51 +10,83 @@
<asp:Content ID="Content2" ContentPlaceHolderID="FeaturedContent" runat="server">
</asp:Content>
<asp:Content ID="Content3" ContentPlaceHolderID="MainContent" runat="server">
<div class="container">
<div class="row panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="col-xs-10">
<h3 class="panel-title"><%: traduci("Collaudi") %></h3>
</div>
<div class="col-xs-2">
<asp:Button runat="server" ID="btnAddNewSetMis" CssClass="btn btn-success" Text='<%# traduci("btnAddNewSetMis") %>' OnClick="btnAddNewSetMis_click" Font-Size="0.9em" Width="100%" />
</div>
</div>
<div class="row" style="font-size: 0.8em;">
<div class="col-xs-2">
<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 class="col-xs-4">
<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">
<div style="width: 90%; float: left;">
<asp:DropDownList runat="server" ID="ddlSelScheda" DataSourceID="odsScheda" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlSelScheda_SelectedIndexChanged" Width="100%"></asp:DropDownList>
<asp:ObjectDataSource ID="odsScheda" 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" />
</SelectParameters>
</asp:ObjectDataSource>
<div class="container-flow">
<div class="row" style="margin: 0px 5px;">
<div class="col-xs-7">
<div class="row panel panel-default">
<div class="panel-heading">
<div class="row">
<div class="col-xs-10">
<h3 class="panel-title"><%: traduci("CollaudiAttivi") %></h3>
</div>
<div class="col-xs-2">
<asp:Button runat="server" ID="btnAddNewSetMis" CssClass="btn btn-success" Text='<%# traduci("btnAddNewSetMis") %>' OnClick="btnAddNewSetMis_click" Font-Size="0.9em" Width="100%" />
</div>
</div>
<div style="width: 10%; float: right;" class="text-right;">
<asp:HyperLink runat="server" ID="hlDoc" Target="_blank"><i class="fa fa-external-link fa-2x"></i></asp:HyperLink>
<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>
<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: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-5">
<div style="width: 90%; float: left;">
<asp:DropDownList runat="server" ID="ddlSelScheda" DataSourceID="odsScheda" DataTextField="label" DataValueField="value" AutoPostBack="True" OnSelectedIndexChanged="ddlSelScheda_SelectedIndexChanged" Width="100%"></asp:DropDownList>
<asp:ObjectDataSource ID="odsScheda" 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" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div style="width: 10%; float: right;" class="text-right;">
<asp:HyperLink runat="server" ID="hlDoc" Target="_blank"><i class="fa fa-external-link fa-2x"></i></asp:HyperLink>
</div>
</div>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_collaudi runat="server" ID="mod_collaudi" />
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
</div>
</div>
</div>
<div class="col-xs-12">
<uc1:mod_collaudi runat="server" ID="mod_collaudi" />
</div>
<div class="col-xs-12 panel-footer">
<uc1:mod_righePag runat="server" ID="mod_righePag" />
<div class="col-xs-5" style="font-size: 0.9em;">
<div class="row panel panel-warning">
<div class="panel-heading">
<div class="row">
<div class="col-xs-12">
<h3 class="panel-title"><%: traduci("CollaudiPrev") %></h3>
</div>
</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>
<asp:ObjectDataSource ID="odsFasePrev" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="CMS_SC_Data.DS_UtilityTableAdapters.v_selFasiTableAdapter"></asp:ObjectDataSource>
</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: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" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
CMS_SC/Collaudi.aspx.designer.cs
Generated
+36
View File
@@ -101,5 +101,41 @@ namespace CMS_SC {
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::mod_righePag mod_righePag;
/// <summary>
/// ddlFasePrev 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 ddlFasePrev;
/// <summary>
/// odsFasePrev 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 odsFasePrev;
/// <summary>
/// ddlSelSchedaPrev 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 ddlSelSchedaPrev;
/// <summary>
/// odsSchedaPrev 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 odsSchedaPrev;
}
}
CMS_SC/Content/bootstrap-theme.min.css
Vendored
+3 -2
View File
File diff suppressed because one or more lines are too long
CMS_SC/Content/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
CMS_SC/Content/bootswatch.css
+1 -1
View File
@@ -1,4 +1,4 @@
/*@import url("https://fonts.googleapis.com/css?family=Raleway:400,700");*/
/*@import url("https://fonts.googleapis.com/css?family=Raleway:400,700");*/
.navbar {
font-family: "Raleway", "Helvetica Neue", Helvetica, Arial, sans-serif;
}
CMS_SC/Content/bootswatch.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
.navbar{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.navbar-nav,.navbar-form{margin-left:0;margin-right:0}.navbar-nav>li>a{margin:12.5px 6px;padding:8px 12px;border:1px solid transparent;border-radius:4px}.navbar-nav>li>a:hover{border:1px solid #ddd}.navbar-nav>.active>a,.navbar-nav>.active>a:hover{border:1px solid #ddd}.navbar-default .navbar-nav>.active>a:hover{color:#4582ec}.navbar-inverse .navbar-nav>.active>a:hover{color:#333}.navbar-brand{padding-top:12.5px;padding-bottom:12.5px;line-height:1.9}@media(min-width:768px){.navbar .navbar-nav>li>a{padding:8px 12px}}@media(max-width:768px - 1){.navbar .navbar-nav > li > a{margin:0;}}.btn{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}legend{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.input-group-addon{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{border:1px solid #ddd}.pagination{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.pagination-lg>li>a,.pagination-lg>li>span{padding:14px 24px}.pager{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.pager a{color:#333}.pager a:hover{border-color:transparent;color:#fff}.pager .disabled a{border-color:#ddd}.close{color:#fff;text-decoration:none;text-shadow:none;opacity:.4}.close:hover,.close:focus{color:#fff;opacity:1}.alert .alert-link{color:#fff;text-decoration:underline}.label{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:normal}.label-default{border:1px solid #ddd;color:#333}.badge{padding:1px 7px 5px;vertical-align:2px;font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:normal}.panel-default .close{color:#333}.modal .close{color:#333}
.navbar{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.navbar-nav,.navbar-form{margin-left:0;margin-right:0}.navbar-nav>li>a{margin:12.5px 6px;padding:8px 12px;border:1px solid transparent;border-radius:4px}.navbar-nav>li>a:hover{border:1px solid #ddd}.navbar-nav>.active>a,.navbar-nav>.active>a:hover{border:1px solid #ddd}.navbar-default .navbar-nav>.active>a:hover{color:#4582ec}.navbar-inverse .navbar-nav>.active>a:hover{color:#333}.navbar-brand{padding-top:12.5px;padding-bottom:12.5px;line-height:1.9}@media(min-width:768px){.navbar .navbar-nav>li>a{padding:8px 12px}}@media(max-width:768px - 1){.navbar .navbar-nav > li > a{margin:0;}}.btn{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}legend{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.input-group-addon{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.nav .open>a,.nav .open>a:hover,.nav .open>a:focus{border:1px solid #ddd}.pagination{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.pagination-lg>li>a,.pagination-lg>li>span{padding:14px 24px}.pager{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif}.pager a{color:#333}.pager a:hover{border-color:transparent;color:#fff}.pager .disabled a{border-color:#ddd}.close{color:#fff;text-decoration:none;text-shadow:none;opacity:.4}.close:hover,.close:focus{color:#fff;opacity:1}.alert .alert-link{color:#fff;text-decoration:underline}.label{font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:normal}.label-default{border:1px solid #ddd;color:#333}.badge{padding:1px 7px 5px;vertical-align:2px;font-family:"Raleway","Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:normal}.panel-default .close{color:#333}.modal .close{color:#333}
CMS_SC/Content/font-awesome.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
CMS_SC/Content/variables.css
+1
View File
@@ -0,0 +1 @@

CMS_SC/ToDo.txt
+4 -3
View File
@@ -20,13 +20,10 @@
- allegati FILE (db? fs?)
- check stato DRAFT/in corso/chiuso
- 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).
- 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
@@ -57,5 +54,9 @@ CANCELLAZIONE DOSSIER
- pulsanti delete dossier: condizionare a presenza items child
- NON SERVE GESTIONE STATO --> bastano FASI
- check stato DRAFT/in corso/chiuso (eliminato...)
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).
................................................................................................................
CMS_SC/WebUserControls/mod_collaudi.ascx
+2 -2
View File
@@ -26,7 +26,7 @@
<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 Param." SortExpression="NomePar">
<asp:TemplateField HeaderText="Nome Par." SortExpression="NomePar">
<EditItemTemplate>
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</EditItemTemplate>
@@ -34,7 +34,7 @@
<asp:Label ID="lblNomePar" runat="server" Text='<%# Eval("NomePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="Val. Param." SortExpression="ValorePar">
<asp:TemplateField HeaderText="Val. Par." SortExpression="ValorePar">
<EditItemTemplate>
<asp:TextBox ID="txtValorePar" runat="server" Text='<%# Bind("ValorePar") %>' Visible='<%# Eval("NomePar")!="" %>' />
</EditItemTemplate>
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.
CMS_SC/bundleconfig.json
+20
View File
@@ -0,0 +1,20 @@
[
{
"outputFileName": "Content/bootstrap.css",
"inputFiles": [
"Content/bootstrap.css"
]
},
{
"outputFileName": "Content/bootstrap-theme.css",
"inputFiles": [
"Content/bootstrap-theme.css"
]
},
{
"outputFileName": "Content/font-awesome.css",
"inputFiles": [
"Content/font-awesome.css"
]
}
]
CMS_SC/compilerconfig.json
+8
View File
@@ -2,5 +2,13 @@
{
"outputFile": "Content/Style.css",
"inputFile": "Content/Style.less"
},
{
"outputFile": "Content/bootswatch.css",
"inputFile": "Content/bootswatch.less"
},
{
"outputFile": "Content/variables.css",
"inputFile": "Content/variables.less"
}
]