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

fix grafico modulo consegne x gestioen inizio/fine/note

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-05-14 13:05:58 +02:00
parent 8112a9f76b
commit 4eb3756229
26 changed files with 137 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VersGen/WebSC.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("0.7.025.42")]
[assembly: AssemblyFileVersion("0.7.025.42")]
[assembly: AssemblyVersion("0.8.028.43")]
[assembly: AssemblyFileVersion("0.8.028.43")]
[assembly: AssemblyCopyright("Steamware © 2015-2015")]
[assembly: AssemblyCompany("Steamware")]
VersGen/WebSC.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("0.7.025.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.7.025.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("0.8.028.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("0.8.028.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
VersGen/bin/Release/VersGen.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/TempPE/WebSC.cs.dll
BIN
View File
Binary file not shown.
VersGen/obj/Release/VersGen.dll
BIN
View File
Binary file not shown.
WebSCR.v11.suo
BIN
View File
Binary file not shown.
WebSCR/Squadra.aspx
+1 -1
View File
@@ -9,7 +9,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="ui-mini" style="margin: 1px; padding: 0px;">
<div class="ui-mini" style="margin: 2px; padding: 2px;">
<uc1:mod_consegne runat="server" ID="mod_consegne" />
<uc1:mod_gestIntSquadra runat="server" id="mod_gestIntSquadra" />
<uc1:mod_ImpegnoSmall runat="server" id="mod_ImpegnoSmall" />
WebSCR/WebUserControls/mod_ImpegnoSmall.ascx
+38 -31
View File
@@ -1,41 +1,48 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_ImpegnoSmall.ascx.cs" Inherits="WebSCR.WebUserControls.mod_ImpegnoSmall" %>
<div style="border: 1px solid #696969" class="ui-shadow ui-corner-all">
<asp:FormView ID="frmViewImpegni" runat="server" DataKeyNames="IdxImpegno" DataSourceID="odsImpegni">
<asp:FormView ID="frmViewImpegni" runat="server" DataKeyNames="IdxImpegno" DataSourceID="odsImpegni" Width="100%">
<ItemTemplate>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.9em;">
<asp:Label ID="lblDataOra" runat="server" Text='<%# Eval("DataOra","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("InizioInt")) %>' />
<asp:Label ID="lblInizioInt" runat="server" Text='<%# Eval("InizioInt","<b>{0:dd/MM HH:mm}</b>") %>' ForeColor="#333333" Visible='<%# notNull(Eval("InizioInt")) %>' /><asp:Label ID="lblTipoOra" runat="server" Text='<%# Eval("TipoOrario","({0})") %>' ForeColor="#ACACAC" Font-Size="0.8em" />
<div style="clear: both; font-size: 0.9em;">
<div>
<div class="flLeft" style="font-size: 0.75em; width: 55%;">
<asp:Label CssClass="tStrong flLeft" ID="CognomeLabel" runat="server" Text='<%# Eval("RagSoc") %>' />
</div>
<div class="flRight" style="font-size: 0.8em; width: 45%;">
<div class="flRight" style="clear: both;">
<asp:Label ID="lblTipoOra" runat="server" Text='<%# Eval("TipoOrario","{0} ") %>' ForeColor="#ACACAC" Font-Size="0.8em" />
<asp:Label ID="lblDataOra" runat="server" Text='<%# Eval("DataOra","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("InizioInt")) %>' Width="9em" />
<asp:Label ID="lblInizioInt" runat="server" Text='<%# Eval("InizioInt","<b>{0:dd/MM HH:mm}</b> Inizio") %>' ForeColor="#333333" Visible='<%# notNull(Eval("InizioInt")) %>' Width="9em" />
</div>
<div class="flRight" style="clear: both;">
<asp:Label ID="lblMinViaggio" runat="server" Text='<%# Eval("MinViaggio","{0}") %>' />'<i class="fa fa-truck"></i>
<asp:Label ID="lblMinTotCons" runat="server" Text='<%# Eval("MinTotCons","{0}") %>' />'<i class="fa fa-wrench"></i>
<asp:Label ID="lblFinePrev" runat="server" Text='<%# Eval("FinePrev","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("FineInt")) %>' Width="9em" />
<asp:Label ID="lblFineInt" runat="server" Text='<%# Eval("FineInt","<b>{0:dd/MM HH:mm}</b> Fine") %>' ForeColor="#333333" Visible='<%# notNull(Eval("FineInt")) %>' Width="9em" />
</div>
</div>
</div>
<div class="flRight" style="font-size: 0.9em; color: #ACACAC;">
<asp:Label ID="lblMinViaggio" runat="server" Text='<%# Eval("MinViaggio","{0}") %>' />'<i class="fa fa-truck"></i>
<asp:Label ID="lblMinTotCons" runat="server" Text='<%# Eval("MinTotCons","{0}") %>' />'<i class="fa fa-wrench"></i>
|
<asp:Label ID="lblFinePrev" runat="server" Text='<%# Eval("FinePrev","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("FineInt")) %>' />
<asp:Label ID="lblFineInt" runat="server" Text='<%# Eval("FineInt","<b>{0:dd/MM HH:mm}</b>") %>' ForeColor="#333333" Visible='<%# notNull(Eval("FineInt")) %>' />
</div>
<div class="text-center" style="padding: 0px 2px;">
<div>
<div class="flLeft" style="font-size: 0.75em; width: 100%;">
<div>
<asp:Label CssClass="flLeft" ID="CapLabel" runat="server" Text='<%# string.Format("{0} | {1} - {2} ({3})",Eval("Indir") , Eval("Cap"), Eval("Localita"), Eval("Prov")) %>' />
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.9em; color: #ACACAC;">
<b>
<asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
| <i class="fa fa-building-o"></i>
<asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
</div>
<div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
<asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
</div>
</div>
</div>
</div>
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.75em;">
<asp:Label CssClass="tStrong flRight" ID="CognomeLabel" runat="server" Text='<%# Eval("RagSoc") %>' />
</div>
<div class="flRight" style="font-size: 0.8em;">
<asp:Label CssClass="flRight" ID="CapLabel" runat="server" Text='<%# string.Format("{0} | {1} - {2} ({3})",Eval("Indir") , Eval("Cap"), Eval("Localita"), Eval("Prov")) %>' />
</div>
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.9em; color: #ACACAC;">
<b>
<asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
| <i class="fa fa-building-o"></i>
<asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
</div>
<div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
<asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
</div>
<div style="clear: both; font-size: 0.70em; color: #ACACAC; border-top: 1px solid #EAEAEA;" runat="server" id="divNoteInt" visible='<%# notNull(Eval("NoteInt")) %>'>
<asp:Label ID="lblNoteInt" runat="server" Text='<%# Eval("NoteInt") %>' />
</div>
</ItemTemplate>
</asp:FormView>
WebSCR/WebUserControls/mod_consegne.ascx
+43 -37
View File
@@ -19,49 +19,55 @@
<Columns>
<asp:TemplateField HeaderText="Appuntamento" SortExpression="DataOra">
<ItemTemplate>
<div style="clear: both;">
<div class="flLeft" style="font-size:0.9em;">
<asp:Label ID="lblDataOra" runat="server" Text='<%# Eval("DataOra","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("InizioInt")) %>' />
<asp:Label ID="lblInizioInt" runat="server" Text='<%# Eval("InizioInt","<b>{0:dd/MM HH:mm}</b>") %>' ForeColor="#333333" Visible='<%# notNull(Eval("InizioInt")) %>' /><asp:Label ID="lblTipoOra" runat="server" Text='<%# Eval("TipoOrario","({0})") %>' ForeColor="#ACACAC" Font-Size="0.8em" />
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="select" ToolTip="Mostra Intervento">
<div style="clear: both; font-size: 0.9em;">
<div>
<div class="flLeft" style="font-size: 0.75em; width: 55%;">
<asp:Label CssClass="tStrong flLeft" ID="CognomeLabel" runat="server" Text='<%# Eval("RagSoc") %>' />
</div>
<div class="flRight" style="font-size: 0.8em; width: 45%;">
<div class="flRight" style="clear: both;">
<asp:Label ID="lblTipoOra" runat="server" Text='<%# Eval("TipoOrario","{0} ") %>' ForeColor="#ACACAC" Font-Size="0.8em" />
<asp:Label ID="lblDataOra" runat="server" Text='<%# Eval("DataOra","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("InizioInt")) %>' Width="9em" />
<asp:Label ID="lblInizioInt" runat="server" Text='<%# Eval("InizioInt","<b>{0:dd/MM HH:mm}</b> Inizio") %>' ForeColor="#333333" Visible='<%# notNull(Eval("InizioInt")) %>' Width="9em" />
</div>
<div class="flRight" style="clear: both;">
<asp:Label ID="lblMinViaggio" runat="server" Text='<%# Eval("MinViaggio","{0}") %>' />'<i class="fa fa-truck"></i>
<asp:Label ID="lblMinTotCons" runat="server" Text='<%# Eval("MinTotCons","{0}") %>' />'<i class="fa fa-wrench"></i>
<asp:Label ID="lblFinePrev" runat="server" Text='<%# Eval("FinePrev","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("FineInt")) %>' Width="9em" />
<asp:Label ID="lblFineInt" runat="server" Text='<%# Eval("FineInt","<b>{0:dd/MM HH:mm}</b> Fine") %>' ForeColor="#333333" Visible='<%# notNull(Eval("FineInt")) %>' Width="9em" />
</div>
</div>
</div>
<div>
<div class="flLeft" style="font-size: 0.75em; width: 100%;">
<div>
<asp:Label CssClass="flLeft" ID="CapLabel" runat="server" Text='<%# string.Format("{0} | {1} - {2} ({3})",Eval("Indir") , Eval("Cap"), Eval("Localita"), Eval("Prov")) %>' />
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.9em; color: #ACACAC;">
<b>
<asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
| <i class="fa fa-building-o"></i>
<asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
</div>
<div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
<asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
</div>
</div>
</div>
</div>
</div>
<div class="flRight" style="font-size:0.9em; color: #ACACAC;">
<asp:Label ID="lblMinViaggio" runat="server" Text='<%# Eval("MinViaggio","{0}") %>' />'<i class="fa fa-truck"></i>
<asp:Label ID="lblMinTotCons" runat="server" Text='<%# Eval("MinTotCons","{0}") %>' />'<i class="fa fa-wrench"></i>
|
<asp:Label ID="lblFinePrev" runat="server" Text='<%# Eval("FinePrev","{0:dd/MM HH:mm}") %>' ForeColor="#ACACAC" Visible='<%# !notNull(Eval("FineInt")) %>' />
<asp:Label ID="lblFineInt" runat="server" Text='<%# Eval("FineInt","<b>{0:dd/MM HH:mm}</b>") %>' ForeColor="#333333" Visible='<%# notNull(Eval("FineInt")) %>' />
<div style="clear: both; font-size: 0.70em; color: #ACACAC; border-top: 1px solid #EAEAEA;" runat="server" id="divNoteInt" visible='<%# notNull(Eval("NoteInt")) %>'>
<asp:Label ID="lblNoteInt" runat="server" Text='<%# Eval("NoteInt") %>' />
</div>
<div class="text-center" style="padding: 0px 2px;">
</div>
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.75em;">
<asp:Label CssClass="tStrong flRight" ID="CognomeLabel" runat="server" Text='<%# Eval("RagSoc") %>' />
</div>
<div class="flRight" style="font-size: 0.8em;">
<asp:Label CssClass="flRight" ID="CapLabel" runat="server" Text='<%# string.Format("{0} | {1} - {2} ({3})",Eval("Indir") , Eval("Cap"), Eval("Localita"), Eval("Prov")) %>' />
</div>
</div>
<div style="clear: both;">
<div class="flLeft" style="font-size: 0.9em; color: #ACACAC;">
<b>
<asp:Label ID="lblRifOC" runat="server" Text='<%# Eval("RifOC") %>' /></b>
| <i class="fa fa-building-o"></i>
<asp:Label ID="lblPianoCons" runat="server" Text='<%# Eval("PianoCons") %>' /><asp:Label ID="lblAscensore" runat="server" Visible='<%# Eval("Ascensore") %>' Text=" | Ascensore" /><asp:Label ID="lblRitUsato" runat="server" Visible='<%# Eval("RitUsato") %>' Text=" | Ritiro Usato" />
</div>
<div class="flRight" style="font-size: 0.8em; color: #ACACAC;">
<asp:Label ID="lblNoteGen" runat="server" Text='<%# Eval("NoteGen") %>' />
</div>
</div>
</asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<%--<asp:TemplateField ShowHeader="False">
<ItemTemplate>
<div class="ui-nodisc-icon ui-alt-icon" style="white-space: nowrap;">
<asp:LinkButton ID="lbSelect" runat="server" CausesValidation="False" CommandName="Select" CommandArgument="select" Text="list" ToolTip="Mostra Intervento" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-search ui-btn-icon-notext ui-btn-inline" />
</div>
</ItemTemplate>
</asp:TemplateField>
</asp:TemplateField>--%>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" SelectMethod="getBySearch" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter" OldValuesParameterFormatString="original_{0}">
WebSCR/WebUserControls/mod_gestIntSquadra.ascx
+7 -4
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadra" %>
<asp:HiddenField runat="server" ClientIDMode="Static" id="hLat" />
<asp:HiddenField runat="server" ClientIDMode="Static" id="hLon" />
<asp:HiddenField runat="server" ClientIDMode="Static" ID="hLat" />
<asp:HiddenField runat="server" ClientIDMode="Static" ID="hLon" />
<script>
$(document).ready(function (e) {
navigator.geolocation.getCurrentPosition(function (pos) {
@@ -25,6 +25,9 @@
<asp:LinkButton ID="lbNoteInt" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Note Intervento" Width="75%" OnClick="lbNoteInt_Click" />
<asp:LinkButton ID="lbFileInt" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-camera ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Allega File" Width="75%" OnClick="lbFileInt_Click" />
</div>
<asp:Label ID="lblLat" runat="server" Visible="true" Text="lat" />
<asp:Label ID="lblLon" runat="server" Visible="true" Text="lon" />
<div id="divNote" runat="server" visible="false" style="text-align: center; margin: auto;">
<asp:TextBox runat="server" ID="txtNote" TextMode="MultiLine" Height="2em" />
<asp:LinkButton ID="lbAddNote" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Salva Nota" Width="75%" OnClick="lbAddNote_Click" />
</div>
</div>
WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs
+30 -1
View File
@@ -53,7 +53,7 @@ namespace WebSCR.WebUserControls
double answ = 0;
try
{
answ = Convert.ToDouble(hLat.Value.Replace(".",","));
answ = Convert.ToDouble(hLat.Value.Replace(".", ","));
}
catch
{ }
@@ -105,6 +105,14 @@ namespace WebSCR.WebUserControls
{ }
lbInizioInt.Visible = !iniziato;
lbFineInt.Visible = iniziato && !finito;
if (divNote.Visible)
{
lbNoteInt.Text = "Annulla edit note";
}
else
{
lbNoteInt.Text = "Note Intervento";
}
}
}
@@ -130,7 +138,16 @@ namespace WebSCR.WebUserControls
protected void lbNoteInt_Click(object sender, EventArgs e)
{
divNote.Visible = !divNote.Visible;
fixVisibility();
string note = "";
try
{
note = DtProxy.man.taImp.getByKey(IdxImpegno)[0].NoteInt;
}
catch
{ }
txtNote.Text = note;
reportEvent();
}
@@ -139,5 +156,17 @@ namespace WebSCR.WebUserControls
fixVisibility();
reportEvent();
}
/// <summary>
/// Aggiungo nota...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbAddNote_Click(object sender, EventArgs e)
{
DtProxy.man.taImp.updNoteInt(IdxImpegno, txtNote.Text.Trim());
divNote.Visible = false;
fixVisibility();
reportEvent();
}
}
}
WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs
Generated
+13 -4
View File
@@ -67,21 +67,30 @@ namespace WebSCR.WebUserControls {
protected global::System.Web.UI.WebControls.LinkButton lbFileInt;
/// <summary>
/// lblLat control.
/// divNote 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.Label lblLat;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNote;
/// <summary>
/// lblLon control.
/// txtNote 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.Label lblLon;
protected global::System.Web.UI.WebControls.TextBox txtNote;
/// <summary>
/// lbAddNote 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.LinkButton lbAddNote;
}
}
WebSCR/WebUserControls/mod_impegno.ascx
+1 -1
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_impegno.ascx.cs" Inherits="WebSCR.WebUserControls.mod_impegno" %>
<asp:FormView ID="frmViewImpegni" runat="server" DataKeyNames="IdxImpegno" DataSourceID="odsImpegni">
<asp:FormView ID="frmViewImpegni" runat="server" DataKeyNames="IdxImpegno" DataSourceID="odsImpegni" Width="100%">
<EditItemTemplate>
<div>
<div class="ui-grid-b">
WebSCR/bin/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR/bin/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR/obj/Debug/WebSCR.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
WebSCR/obj/Debug/WebSCR.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Debug/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Release/SteamWare.dll
BIN
View File
Binary file not shown.
WebSCR_data/bin/Release/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.csprojResolveAssemblyReference.cache
BIN
View File
Binary file not shown.
WebSCR_data/obj/Debug/WebSCR_data.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Release/TempPE/DS_Applicazione.Designer.cs.dll
BIN
View File
Binary file not shown.
WebSCR_data/obj/Release/WebSCR_data.dll
BIN
View File
Binary file not shown.