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

update installer x vers 1.7 prod ITA concordata

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-03-30 17:24:08 +02:00
parent e75a3702f9
commit bfe05da01a
22 changed files with 2687 additions and 1391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/ReleaseClienti/Somaschini ITA/GIM_site.zip
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_data/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/Content/Style.css
+21
View File
@@ -112,6 +112,27 @@
color: Black;
font-size: 8pt;
}
.bloccoDiv {
border-bottom: solid 1px green;
padding-bottom: 1px;
margin-bottom: 5px;
}
.semaforoVerde {
color: Green;
}
.semaforoGiallo {
color: Orange;
font-weight: bold;
}
.semaforoRosso {
color: Red;
font-weight: bold;
}
/* colori base */
.sfondoGrigio {
background-color: #CDCDCD;
}
/* END colori base */
/*------------------------------------------------------------------
[ navbar / .navbar ]
*/
Projects/WebGIM/GIM_site/Content/Style.less
+537 -517
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_site/Content/Style.less.bak
+1342
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_site/Content/Style.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Projects/WebGIM/GIM_site/Style.css
+768 -863
View File
File diff suppressed because it is too large Load Diff
Projects/WebGIM/GIM_site/Web.config
+2
View File
@@ -132,6 +132,8 @@
<add key="defaultCodMacc" value="0000" />
<add key="idxAmbitoMtzProg" value="7" />
<add key="idxAmbitoRicambi" value="10" />
<add key="idxAmbitoND" value="1" />
<add key="idxCausaleND" value="1" />
<add key="defCausale" value="60" />
<!--gestione turni-->
<add key="shiftTurno" value="6" />
Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_default.ascx
+4 -4
View File
@@ -240,7 +240,8 @@
<br />
<asp:DropDownList runat="server" ID="ddlAmbito" Font-Bold="True" Font-Size="9pt" CssClass="textEv_2" DataSourceID="odsAmbiti" DataTextField="label" DataValueField="value" BackColor="#cdffcd" SelectedValue='<%# Bind("idxAmbito") %>'>
</asp:DropDownList>
<%--<asp:TextBox ID="descrAmbitoGuastoLabel" runat="server" Text='<%# Eval("descrAmbitoGuasto") %>' CssClass="textEv_Read" ReadOnly="true" />--%>
<asp:CompareValidator ID="cvAmbito" runat="server" ErrorMessage="!!!" CssClass="warnRed" ControlToValidate="ddlAmbito" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxAmbitoND") %>'></asp:CompareValidator>
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblImpianto" Text='<%# traduci("lblImpianto") %>' Font-Size="X-Small" />
@@ -278,6 +279,7 @@
DataTextField="label" DataValueField="value" Width="100%" BackColor="#cdffcd"
Font-Size="8pt" SelectedValue='<%# Bind("idxCausale") %>'>
</asp:DropDownList>
<asp:CompareValidator ID="cvCausale" runat="server" ErrorMessage="!!!" ControlToValidate="listCausali" CssClass="warnRed" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxCausaleND") %>'></asp:CompareValidator>
<asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditioAndCurr" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
<SelectParameters>
@@ -388,9 +390,7 @@
</div>
</EditItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="ods_default" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByIdx" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter"
UpdateMethod="sp_updateIntervento" OnUpdated="ods_default_Updated">
<asp:ObjectDataSource ID="ods_default" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByIdx" TypeName="GIM_data.DS_applicazioneTableAdapters.v_intervExpTableAdapter" UpdateMethod="sp_updateIntervento" OnUpdated="ods_default_Updated">
<UpdateParameters>
<asp:Parameter Name="Original_numIntMtz" Type="Int32" />
<asp:Parameter Name="idxStato" Type="Int32" />
Projects/WebGIM/GIM_site/WebUserControls/mod_dettInt_full.ascx
+2
View File
@@ -60,6 +60,7 @@
<br />
<asp:DropDownList runat="server" ID="ddlAmbito" Font-Bold="True" Font-Size="9pt" CssClass="textEv_2" DataSourceID="odsAmbiti" DataTextField="label" DataValueField="value" BackColor="#cdffcd" SelectedValue='<%# Bind("idxAmbito") %>'>
</asp:DropDownList>
<asp:CompareValidator ID="cvAmbito" runat="server" ErrorMessage="!!!" CssClass="warnRed" ControlToValidate="ddlAmbito" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxAmbitoND") %>'></asp:CompareValidator>
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblImpianto" Text='<%# traduci("lblImpianto") %>' Font-Size="X-Small" />
@@ -88,6 +89,7 @@
<asp:Label runat="server" ID="lblCausale" Text='<%# Eval("idxCausale") %>' Visible="false" />
<asp:DropDownList ID="listCausali" runat="server" DataSourceID="odsCausali" DataTextField="label" DataValueField="value" Width="100%" BackColor="#cdffcd" Font-Size="8pt" SelectedValue='<%# Bind("idxCausale") %>'>
</asp:DropDownList>
<asp:CompareValidator ID="cvCausale" runat="server" ErrorMessage="!!!" ControlToValidate="listCausali" CssClass="warnRed" Operator="NotEqual" ValueToCompare='<%# SteamWare.memLayer.ML.CRI("idxCausaleND") %>'></asp:CompareValidator>
<asp:ObjectDataSource ID="odsCausali" runat="server" OldValuesParameterFormatString="original_{0}"
SelectMethod="getByConditioAndCurr" TypeName="GIM_data.DS_utilityTableAdapters.v_selCausaliMacchineTableAdapter" OnDataBinding="odsCausali_DataBinding">
<SelectParameters>
Projects/WebGIM/GIM_site/WebUserControls/mod_dettaglioIntervento.ascx
+1 -1
View File
@@ -25,7 +25,7 @@
<asp:Button CssClass="btn btn-warning" ID="btnEditFull" runat="server" Width="100%" OnClick="btnEditFull_Click" />
</div>
<div class="col-xs-3">
<asp:Button ID="btnCancel" runat="server" Width="100%" OnClick="btnCancel_Click" CssClass="btn btn-danger" />
<asp:Button ID="btnCancel" runat="server" Width="100%" OnClick="btnCancel_Click" CssClass="btn btn-danger" ValidationGroup="cancel" />
<cc1:ConfirmButtonExtender ID="cbeCancel" runat="server" TargetControlID="btnCancel" />
</div>
</div>
Projects/WebGIM/GIM_site/WebUserControls/mod_elencoRichieste.ascx
+3 -1
View File
@@ -53,7 +53,9 @@
SortExpression="numIntMtz" />
<asp:TemplateField HeaderText="Stato" SortExpression="DescrStato">
<ItemTemplate>
<asp:Label ID="Label7" runat="server" Text='<%# Bind("DescrStato") %>' CssClass='<%# stileDaStato(Eval("idxStato")) %>' />
<div runat="server" id="divStato" class='<%# stileDaStato(Eval("idxStato")) %>' style="width: 100%;">
<asp:Label ID="Label7" runat="server" Text='<%# Bind("DescrStato") %>' CssClass='<%# stileDaStato(Eval("idxStato")) %>' />
</div>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="dataOraInsRichiesta" SortExpression="richiesta">
Projects/WebGIM/GIM_site/bin/GIM_data.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/GIM_site.dll.config
+2
View File
@@ -132,6 +132,8 @@
<add key="defaultCodMacc" value="0000" />
<add key="idxAmbitoMtzProg" value="7" />
<add key="idxAmbitoRicambi" value="10" />
<add key="idxAmbitoND" value="1" />
<add key="idxCausaleND" value="1" />
<add key="defCausale" value="60" />
<!--gestione turni-->
<add key="shiftTurno" value="6" />
Projects/WebGIM/GIM_site/bin/SteamWare.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/GIM_site/bin/VersGen.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/VersGen/WebGIM.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.295.534")]
[assembly: AssemblyFileVersion("1.6.295.534")]
[assembly: AssemblyVersion("1.7.299.534")]
[assembly: AssemblyFileVersion("1.7.299b.534")]
[assembly: AssemblyCopyright("Steamware © 2006-2016")]
[assembly: AssemblyCompany("Steamware")]
Projects/WebGIM/VersGen/WebGIM.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.295.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.6.295.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.7.299.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.7.299b.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Projects/WebGIM/VersGen/bin/Debug/VersGen.dll
BIN
View File
Binary file not shown.
Projects/WebGIM/VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.