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

Revisione pagina edit intervento

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-12-11 10:29:44 +01:00
parent 684bf74ce8
commit 413699b6bc
8 changed files with 225 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Projects/WebGIM/GIM_site/Content/Style.css
+12 -1
View File
@@ -660,7 +660,7 @@
/* No media query since this is the default in Bootstrap */
@media (max-width: 768px) {
body {
font-size: 12px;
font-size: 9px;
}
.navbar .mainnav > li > a {
padding: 0 10px;
@@ -811,6 +811,9 @@
}
/* Small devices (tablets, 768px and up) */
@media (min-width: 768px) {
body {
font-size: 10px;
}
.subnav-collapse.collapse {
display: block !important;
height: auto !important;
@@ -819,8 +822,16 @@
}
}
/* Medium devices (desktops, 992px and up) */
@media (min-width: 992px) {
body {
font-size: 12px;
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
body {
font-size: 14px;
}
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
Projects/WebGIM/GIM_site/Content/Style.less
+13 -4
View File
@@ -793,7 +793,7 @@
/* No media query since this is the default in Bootstrap */
@media (max-width: 768px) {
body {
font-size: 12px;
font-size: 9px;
}
.navbar .mainnav > li > a {
@@ -976,7 +976,10 @@
}
/* Small devices (tablets, 768px and up) */
@media (min-width: 768px) {
body {
font-size: 10px;
}
.subnav-collapse.collapse {
display: block !important;
height: auto !important;
@@ -986,11 +989,17 @@
}
/* Medium devices (desktops, 992px and up) */
@media (min-width: 992px) {
body {
font-size: 12px;
}
}
/* Large devices (large desktops, 1200px and up) */
@media (min-width: 1200px) {
body {
font-size: 14px;
}
.nav > li > a {
padding: 4px 8px;
font-size: 1.2em;
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/WebUserControls/mod_dettaglioIntervento.ascx
+188 -156
View File
@@ -25,160 +25,108 @@
<cc1:ConfirmButtonExtender ID="cbeCancel" runat="server" TargetControlID="btnCancel" />
</div>
</div>
<asp:FormView ID="frmView_default" runat="server" DataKeyNames="numIntMtz" DataSourceID="ods_default"
Width="100%">
<asp:FormView ID="frmView_default" runat="server" DataKeyNames="numIntMtz" DataSourceID="ods_default" Width="100%">
<ItemTemplate>
<div id="divReadOnly">
<div id="divUp" style="background-color: #E5E2E1; padding: 10px; border-top: solid 2px orange;">
<div class="row">
<div class="col-xs-8">
<table>
<tr>
<td>
<asp:Label runat="server" ID="lblNumIntMtz" Text='<%# traduci("numIntMtz") %>' Font-Size="X-Small" />
</td>
<td>
<asp:Label runat="server" ID="lblDataOra" Text='<%# traduci("lblDataOraRich") %>'
Font-Size="X-Small" />
</td>
<td>
<asp:Label runat="server" ID="lblDataOraGuasto" Text='<%# traduci("lblDataOraGuasto") %>'
Font-Size="X-Small" />
</td>
<td>
<asp:Label runat="server" ID="lblDataLav" Text='<%# traduci("lblDataLav") %>' Font-Size="X-Small" />
</td>
<td>
<asp:Label runat="server" ID="lblTurnoLav" Text='<%# traduci("lblTurnoLav") %>' Font-Size="X-Small" />
</td>
<td>
<asp:Label runat="server" ID="lblMatr" Text='<%# traduci("lblMatr") %>' Font-Size="X-Small" />
</td>
</tr>
<tr>
<td>
<asp:TextBox ID="numIntMtzLabel" runat="server" Text='<%# Eval("numIntMtz") %>' CssClass="fixedVal"
ReadOnly="true" Width="30px" />
</td>
<td>
<asp:TextBox ID="richiestaLabel" runat="server" Text='<%# Eval("richiesta") %>' CssClass="fixedVal"
ReadOnly="true" Width="105px" />
</td>
<td>
<asp:TextBox ID="guastoLabel" runat="server" Text='<%# Eval("guasto") %>' CssClass="fixedVal"
ReadOnly="true" Width="110px" />
</td>
<td>
<asp:TextBox ID="dataLavLabel" runat="server" Text='<%# Eval("dataLav","{0:dd/MM/yy}") %>'
CssClass="fixedVal" ReadOnly="true" Width="105px" />
</td>
<td>
<asp:TextBox ID="turnoLavLabel" runat="server" Text='<%# Eval("turnoLav") %>' CssClass="fixedVal"
ReadOnly="true" Width="30px" />
</td>
<td>
<asp:TextBox ID="matrLabel" runat="server" Text='<%# Eval("matr") %>' CssClass="fixedVal"
ReadOnly="true" Width="105px" />
</td>
</tr>
<tr>
<td>
<asp:Label runat="server" ID="lblIsFermo" Text='<%# traduci("lblIsFermo") %>' Font-Size="X-Small" />
</td>
<td colspan="5">
<asp:Label runat="server" ID="lblDettagliGuasto" Text='<%# traduci("lblDettagliGuasto") %>'
Font-Size="X-Small" />
</tr>
<tr>
<td>
<asp:CheckBox ID="isFermoCheckBox" runat="server" Checked='<%# Eval("isFermo") %>'
Enabled="false" />
</td>
<td colspan="5">
<asp:TextBox ID="descrAmbitoGuastoLabel" runat="server" Text='<%# Eval("descrAmbitoGuasto") %>'
CssClass="fixedVal" ReadOnly="true" />
</tr>
<tr>
<td>
<asp:Label runat="server" ID="lblImpianto" Text='<%# traduci("lblImpianto") %>' Font-Size="X-Small" />
</td>
<td colspan="5">
<asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label"
DataValueField="value" AutoPostBack="true" Width="400px" BackColor="Silver" Font-Size="8pt"
SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
</td>
</tr>
<tr>
<td>
<asp:Label runat="server" ID="lblMacchina" Text='<%# traduci("lblMacchina") %>' Font-Size="X-Small" />
</td>
<td colspan="5">
<asp:DropDownList ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine"
DataTextField="label" DataValueField="value" Width="400px" BackColor="Silver"
Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false">
</asp:DropDownList>
<%--<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
<div class="col-xs-9 col-md-8">
<div class="row">
<div class="col-xs-2">
<asp:Label runat="server" ID="lblNumIntMtz" Text='<%# traduci("numIntMtz") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="numIntMtzLabel" runat="server" Text='<%# Eval("numIntMtz") %>' CssClass="fixedVal" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDataOra" Text='<%# traduci("lblDataOraRich") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="richiestaLabel" runat="server" Text='<%# Eval("richiesta") %>' CssClass="fixedVal" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDataOraGuasto" Text='<%# traduci("lblDataOraGuasto") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="guastoLabel" runat="server" Text='<%# Eval("guasto") %>' CssClass="fixedVal" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-2">
<asp:Label runat="server" ID="lblDataLav" Text='<%# traduci("lblDataLav") %>' Font-Size="X-Small" />
<asp:Label runat="server" ID="lblTurnoLav" Text='<%# traduci("lblTurnoLav") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="dataLavLabel" runat="server" Text='<%# Eval("dataLav","{0:dd/MM/yy}") %>' CssClass="fixedVal" ReadOnly="true" Width="5em" />
<asp:TextBox ID="turnoLavLabel" runat="server" Text='<%# Eval("turnoLav") %>' CssClass="fixedVal" ReadOnly="true" Width="1.5em" />
</div>
<div class="col-xs-2">
<asp:Label runat="server" ID="lblMatr" Text='<%# traduci("lblMatr") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="matrLabel" runat="server" Text='<%# Eval("matr") %>' CssClass="fixedVal" ReadOnly="true" Width="100%" />
</div>
</div>
<div class="row">
<div class="col-xs-2">
<asp:Label runat="server" ID="lblIsFermo" Text='<%# traduci("lblIsFermo") %>' Font-Size="X-Small" />
<br />
<asp:CheckBox ID="isFermoCheckBox" runat="server" Checked='<%# Eval("isFermo") %>' Enabled="false" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDettagliGuasto" Text='<%# traduci("lblDettagliGuasto") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrAmbitoGuastoLabel" runat="server" Text='<%# Eval("descrAmbitoGuasto") %>' CssClass="fixedVal" ReadOnly="true" />
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblImpianto" Text='<%# traduci("lblImpianto") %>' Font-Size="X-Small" />
<br />
<asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" AutoPostBack="true" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="row">
<div class="col-xs-5">
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblMacchina" Text='<%# traduci("lblMacchina") %>' Font-Size="X-Small" />
<br />
<asp:DropDownList ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false">
</asp:DropDownList>
<%--<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="listImpianti" DefaultValue="0" Name="conditio" PropertyName="SelectedValue"
Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>--%>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</td>
</tr>
<tr>
<td style="padding-top: 15px;">
<asp:Label runat="server" ID="lblDescrCausale" Text='<%# traduci("lblDescrCausale") %>'
Font-Size="X-Small" />
</td>
<td colspan="5" style="padding-top: 15px;">
<asp:TextBox ID="descrCausaleLabel" runat="server" Text='<%# Eval("descrCausale") %>'
CssClass="fixedValLeft" ReadOnly="true" Width="530px" />
</td>
</tr>
<tr>
<td>
<asp:Label runat="server" ID="lblDescrPriorita" Text='<%# traduci("lblDescrPriorita") %>'
Font-Size="X-Small" />
</td>
<td colspan="2">
<asp:Label runat="server" ID="lblDescrizioneGen" Text='<%# traduci("lblDescrizioneGen") %>'
Font-Size="X-Small" />
</td>
</tr>
<tr style="vertical-align: top;">
<td>
<asp:TextBox ID="descrPrioritaLabel" runat="server" Text='<%# Eval("descrPriorita") %>'
CssClass="fixedVal" ReadOnly="true" />
</td>
<td colspan="5">
<asp:TextBox ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>'
CssClass="fixedValLeft" ReadOnly="true" Height="100px" Width="530px" TextMode="MultiLine" />
</td>
</tr>
<tr>
<td colspan="5">
<asp:Label runat="server" ID="lblDescrTipo" Text='<%# traduci("lblDescrTipo") %>'
Font-Size="X-Small" />
</td>
</tr>
<tr>
<td>
<asp:TextBox ID="descrTipoLabel" runat="server" Text='<%# Eval("descrTipo") %>' CssClass="fixedVal"
ReadOnly="true" />
</td>
</tr>
</table>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="row" style="padding-top: 0.5em;">
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDescrCausale" Text='<%# traduci("lblDescrCausale") %>' Font-Size="X-Small" />
</div>
<div class="col-xs-9">
<asp:TextBox ID="descrCausaleLabel" runat="server" Text='<%# Eval("descrCausale") %>' CssClass="fixedValLeft" ReadOnly="true" Width="100%" />
</div>
</div>
<div class="row">
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDescrPriorita" Text='<%# traduci("lblDescrPriorita") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrPrioritaLabel" runat="server" Text='<%# Eval("descrPriorita") %>' CssClass="fixedVal" ReadOnly="true" />
<br />
<asp:Label runat="server" ID="lblDescrTipo" Text='<%# traduci("lblDescrTipo") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrTipoLabel" runat="server" Text='<%# Eval("descrTipo") %>' CssClass="fixedVal" ReadOnly="true" />
</div>
<div class="col-xs-9">
<asp:Label runat="server" ID="lblDescrizioneGen" Text='<%# traduci("lblDescrizioneGen") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' CssClass="fixedValLeft" ReadOnly="true" Height="6em" Width="100%" TextMode="MultiLine" />
</div>
</div>
</div>
<div class="col-xs-4" runat="server" id="divRicambi" visible='<%# showMR %>'>
<div class="col-xs-3 col-md-4 text-right" runat="server" id="divRicambi" visible='<%# showMR %>'>
<b><%: traduci("RicambiImpiegati") %></b>
<uc1:mod_MovMag2Int runat="server" ID="mod_MovMag2Int" enableEdit="false" />
<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>
<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>
</div>
</div>
</div>
@@ -266,8 +214,99 @@
</div>
</div>
<div class="row">
<div id="divUp" class="col-xs-8">
<table>
<div id="divUp" class="col-xs-9 col-md-8">
<div class="row">
<div class="col-xs-2">
<asp:Label runat="server" ID="lblNumIntMtz" Text='<%# traduci("numIntMtz") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="numIntMtzLabel" runat="server" Text='<%# Eval("numIntMtz") %>' CssClass="textEv_Read" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDataOra" Text='<%# traduci("lblDataOraRich") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="richiestaLabel" runat="server" Text='<%# Eval("richiesta") %>' CssClass="textEv_Read" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDataOraGuasto" Text='<%# traduci("lblDataOraGuasto") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="guastoLabel" runat="server" Text='<%# Eval("guasto") %>' CssClass="textEv_Read" ReadOnly="true" Width="100%" />
</div>
<div class="col-xs-2">
<asp:Label runat="server" ID="lblDataLav" Text='<%# traduci("lblDataLav") %>' Font-Size="X-Small" />
<asp:Label runat="server" ID="lblTurnoLav" Text='<%# traduci("lblTurnoLav") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="dataLavLabel" runat="server" Text='<%# Eval("dataLav","{0:dd/MM/yy}") %>' CssClass="textEv_Read" ReadOnly="true" Width="5em" />
<asp:TextBox ID="turnoLavLabel" runat="server" Text='<%# Eval("turnoLav") %>' CssClass="textEv_Read" ReadOnly="true" Width="1.5em" />
</div>
<div class="col-xs-2">
<asp:Label runat="server" ID="lblMatr" Text='<%# traduci("lblMatr") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="matrLabel" runat="server" Text='<%# Eval("matr") %>' CssClass="textEv_Read" ReadOnly="true" Width="100%" />
</div>
</div>
<div class="row">
<div class="col-xs-2">
<asp:Label runat="server" ID="lblIsFermo" Text='<%# traduci("lblIsFermo") %>' Font-Size="X-Small" />
<br />
<asp:CheckBox ID="isFermoCheckBox" runat="server" Checked='<%# Eval("isFermo") %>' Enabled="false" />
</div>
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDettagliGuasto" Text='<%# traduci("lblDettagliGuasto") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrAmbitoGuastoLabel" runat="server" Text='<%# Eval("descrAmbitoGuasto") %>' CssClass="textEv_Read" ReadOnly="true" />
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblImpianto" Text='<%# traduci("lblImpianto") %>' Font-Size="X-Small" />
<br />
<asp:DropDownList ID="listImpianti" runat="server" DataSourceID="odsImpianti" DataTextField="label" DataValueField="value" AutoPostBack="true" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxImpianto") %>' Enabled="false">
</asp:DropDownList>
<asp:ObjectDataSource ID="odsImpianti" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getImpiantiValidi" TypeName="GIM_data.DS_utilityTableAdapters.v_selImpiantiTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="row">
<div class="col-xs-5">
</div>
<div class="col-xs-7">
<asp:Label runat="server" ID="lblMacchina" Text='<%# traduci("lblMacchina") %>' Font-Size="X-Small" />
<br />
<asp:DropDownList ID="listMacchine" runat="server" AutoPostBack="True" DataSourceID="odsMacchine" DataTextField="label" DataValueField="value" Width="100%" BackColor="Silver" Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>' Enabled="false">
</asp:DropDownList>
<%--<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="listImpianti" DefaultValue="0" Name="conditio" PropertyName="SelectedValue"
Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>--%>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</div>
</div>
<div class="row" style="padding-top: 0.5em;">
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDescrCausale" Text='<%# traduci("lblDescrCausale") %>' Font-Size="X-Small" />
</div>
<div class="col-xs-9">
<asp:TextBox ID="descrCausaleLabel" runat="server" Text='<%# Eval("descrCausale") %>' CssClass="textEv_ReadLeft" ReadOnly="true" Width="100%" />
</div>
</div>
<div class="row">
<div class="col-xs-3">
<asp:Label runat="server" ID="lblDescrPriorita" Text='<%# traduci("lblDescrPriorita") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrPrioritaLabel" runat="server" Text='<%# Eval("descrPriorita") %>' CssClass="textEv_Read" ReadOnly="true" />
<br />
<asp:Label runat="server" ID="lblDescrTipo" Text='<%# traduci("lblDescrTipo") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrTipoLabel" runat="server" Text='<%# Eval("descrTipo") %>' CssClass="textEv_Read" ReadOnly="true" />
</div>
<div class="col-xs-9">
<asp:Label runat="server" ID="lblDescrizioneGen" Text='<%# traduci("lblDescrizioneGen") %>' Font-Size="X-Small" />
<br />
<asp:TextBox ID="descrizioneLabel" runat="server" Text='<%# Eval("descrizione") %>' CssClass="textEv_ReadLeft" ReadOnly="true" Height="6em" Width="100%" TextMode="MultiLine" />
</div>
</div>
<%--<table>
<tr>
<td>
<asp:Label runat="server" ID="lblNumIntMtz" Text='<%# traduci("numIntMtz") %>' Font-Size="X-Small" />
@@ -356,13 +395,6 @@
DataValueField="value" Width="400px" BackColor="#deeff7" Font-Size="8pt" SelectedValue='<%# Eval("idxMacchina") %>'
Enabled="false">
</asp:DropDownList>
<%--<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getByConditio" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="listImpianti" DefaultValue="0" Name="conditio" PropertyName="SelectedValue"
Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>--%>
<asp:ObjectDataSource ID="odsMacchine" runat="server" OldValuesParameterFormatString="Original_{0}"
SelectMethod="getData" TypeName="GIM_data.DS_utilityTableAdapters.v_selMacchineTableAdapter"></asp:ObjectDataSource>
</td>
@@ -409,12 +441,12 @@
ReadOnly="true" />
</td>
</tr>
</table>
</table>--%>
</div>
<div class="col-xs-4" id="divRicambi" visible='<%# showMR %>'>
<div class="col-xs-3 col-md-4" id="divRicambi" visible='<%# showMR %>'>
<b><%: traduci("RicambiImpiegati") %></b>
<uc1:mod_MovMag2Int runat="server" ID="mod_MovMag2Int" />
<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>
<%--<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>--%>
</div>
</div>
<div class="row">
@@ -506,7 +538,7 @@
</div>
</div>
<div class="row">
<div id="divUp" class="col-xs-8">
<div id="divUp" class="col-xs-9 col-md-8">
<table>
<tr>
<td>
@@ -675,10 +707,10 @@
</tr>
</table>
</div>
<div class="col-xs-4" id="divRicambi" visible='<%# showMR %>'>
<div class="col-xs-3 col-md-4" id="divRicambi" visible='<%# showMR %>'>
<b><%: traduci("RicambiImpiegati") %></b>
<uc1:mod_MovMag2Int runat="server" ID="mod_MovMag2Int" />
<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>
<%--<asp:HyperLink runat="server" ID="hkMovRicInt" CssClass="btn btn-info" NavigateUrl="~/ConsumoRic"><%# traduci("AddRicambi2Int") %></asp:HyperLink>--%>
</div>
</div>
<div class="row">
Projects/WebGIM/GIM_site/WebUserControls/mod_insertRichiesta.ascx
+6 -6
View File
@@ -4,21 +4,21 @@
<%@ Register Src="~/WebUserControls/mod_dataOra.ascx" TagName="mod_dataOra" TagPrefix="uc1" %>
<asp:Panel ID="pnlMain_InsRichiesta" runat="server" Visible="false">
<div style="width: 100%; background-color: #dedede; font-size: 0.8em;">
<div style="width: 100%; background-color: #696969; text-align: center; height: 8em;">
<div style="width: 100%; background-color: #696969; text-align: center; height: 5em;">
<div class="row">
<div class="col-xs-12">
<asp:Label runat="server" ID="lblTitolo" ForeColor="White" Font-Size="2.5em" />
<asp:Label runat="server" ID="lblTitolo" ForeColor="White" Font-Size="2em" />
</div>
<div class="col-xs-4">
<asp:Label runat="server" ID="lblDataOra" /><br />
<asp:Label runat="server" ID="lblDataOra" />
<asp:TextBox ReadOnly="true" runat="server" ID="txtDataOra" CssClass="fixedVal" />
</div>
<div class="col-xs-4">
<asp:Label runat="server" ID="lblDataLav" /><br />
<asp:Label runat="server" ID="lblDataLav" />
<asp:TextBox ReadOnly="true" runat="server" ID="txtDataLav" CssClass="fixedVal" />
</div>
<div class="col-xs-4">
<asp:Label runat="server" ID="lblTurnoLav" /><br />
<asp:Label runat="server" ID="lblTurnoLav" />
<asp:TextBox ReadOnly="true" runat="server" ID="txtTurnoLav" CssClass="fixedVal" />
</div>
</div>
@@ -116,7 +116,7 @@
<div id="descrizione" style="min-height: 200px;">
<asp:Panel runat="server" ID="Panel2" ScrollBars="None">
<asp:Label runat="server" ID="lblDescrGuasto" /><br />
<asp:TextBox runat="server" ID="txtDescrizione" TextMode="MultiLine" Rows="7" Width="100%" Font-Size="1.1em" />
<asp:TextBox runat="server" ID="txtDescrizione" TextMode="MultiLine" Rows="6" Width="100%" Font-Size="1.1em" />
<asp:RequiredFieldValidator ID="rfvDescrizione" runat="server" ErrorMessage="!!!"
ControlToValidate="txtDescrizione" ValidationGroup="inserimento" Display="Dynamic" />
</asp:Panel>
Projects/WebGIM/GIM_site/insertRichiesta.aspx
+1 -6
View File
@@ -11,12 +11,7 @@
</asp:Content>
<asp:Content ID="Content4" ContentPlaceHolderID="MCon" runat="server">
<div class="container-flow">
<div class="row panel panel-default" style="margin: 4px 8px;">
<div class="panel-heading">
<div class="row" style="margin: 2px 4px;">
<h3 class="panel-title"><%: traduci("AnagAmbitiGuastoLong") %></h3>
</div>
</div>
<div class="row" style="margin: -8px -12px;">
<div class="col-xs-12">
<uc1:mod_insertRichiesta ID="mod_insertRichiesta1" runat="server" causaliVisibili="true" />
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
Projects/WebGIM/VersGen/WebGIM.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.284.517")]
[assembly: AssemblyFileVersion("1.6.284.517")]
[assembly: AssemblyVersion("1.6.285.518")]
[assembly: AssemblyFileVersion("1.6.285.518")]
[assembly: AssemblyCopyright("Steamware © 2006-2015")]
[assembly: AssemblyCompany("Steamware")]
Projects/WebGIM/VersGen/WebGIM.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("1.6.284.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.6.284.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("1.6.285.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("1.6.285.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2006-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+