update visualizzazione task squadra

This commit is contained in:
Samuele E. Locatelli
2015-05-12 17:19:45 +02:00
parent 5deea73f1b
commit dd7009e9fe
29 changed files with 257 additions and 111 deletions
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -55,7 +55,7 @@
<div data-role="header" data-position="fixed" data-theme="a">
<uc2:mod_header runat="server" ID="mod_header" />
</div>
<div role="main" class="ui-content">
<div role="main" class="ui-content" style="padding: 0px;">
<asp:ContentPlaceHolder ID="ContentPlaceHolder1" runat="server">
</asp:ContentPlaceHolder>
</div>
+16
View File
@@ -0,0 +1,16 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Menu.aspx.cs" Inherits="WebSCR.Menu" %>
<%@ Register Src="~/WebUserControls/mod_squadre.ascx" TagPrefix="uc1" TagName="mod_squadre" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="ui-mini">
<uc1:mod_squadre runat="server" ID="mod_squadre" />
<div style="text-align: center; margin: auto;">
<asp:LinkButton ID="lbSetSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Scegli Squadra" Width="75%" OnClick="lbSetSquadra_Click" />
<asp:LinkButton ID="lbResetSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-recycle ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Reset Squadra" Width="75%" OnClick="lbResetSquadra_Click" />
<asp:LinkButton ID="lbComponiSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-edit ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Componi Squadra" Width="75%" OnClick="lbComponiSquadra_Click" />
</div>
</div>
</asp:Content>
@@ -8,11 +8,25 @@ using System.Web.UI.WebControls;
namespace WebSCR
{
public partial class ResetSquadra : System.Web.UI.Page
public partial class Menu : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
// resetto dati squadra e rimando a squadra!
if (!Page.IsPostBack)
{
mod_squadre.Visible = false;
}
}
protected void lbSetSquadra_Click(object sender, EventArgs e)
{
// mostra select squadre...
mod_squadre.Visible = true;
}
protected void lbResetSquadra_Click(object sender, EventArgs e)
{
// reset valori squadra...
memLayer.ML.emptyCookieVal("colorSquadraCurr");
memLayer.ML.emptyCookieVal("SquadraCurr");
memLayer.ML.emptyCookieVal("CodSquadra");
@@ -23,7 +37,12 @@ namespace WebSCR
memLayer.ML.emptyCookieVal("CodCliente");
memLayer.ML.emptyCookieVal("Indir");
memLayer.ML.emptySessionVal("Cliente");
Response.Redirect("Squadra");
Response.Redirect(devicesAuthProxy.pagCorrente);
}
protected void lbComponiSquadra_Click(object sender, EventArgs e)
{
}
}
}
+51
View File
@@ -0,0 +1,51 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR {
public partial class Menu {
/// <summary>
/// mod_squadre control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_squadre mod_squadre;
/// <summary>
/// lbSetSquadra 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 lbSetSquadra;
/// <summary>
/// lbResetSquadra 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 lbResetSquadra;
/// <summary>
/// lbComponiSquadra 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 lbComponiSquadra;
}
}
-16
View File
@@ -1,16 +0,0 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ResetSquadra.aspx.cs" Inherits="WebSCR.ResetSquadra" %>
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
<title></title>
</head>
<body>
<form id="form1" runat="server">
<div>
</div>
</form>
</body>
</html>
-26
View File
@@ -1,26 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR
{
public partial class ResetSquadra
{
/// <summary>
/// form1 control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlForm form1;
}
}
+3 -8
View File
@@ -1,20 +1,15 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="Squadra.aspx.cs" Inherits="WebSCR.Squadra" %>
<%@ Register Src="~/WebUserControls/mod_consegne.ascx" TagPrefix="uc1" TagName="mod_consegne" %>
<%@ Register Src="~/WebUserControls/mod_squadre.ascx" TagPrefix="uc1" TagName="mod_squadre" %>
<%@ Register Src="~/WebUserControls/mod_impegno.ascx" TagPrefix="uc1" TagName="mod_impegno" %>
<%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %>
<%@ Register Src="~/WebUserControls/mod_ImpegnoSmall.ascx" TagPrefix="uc1" TagName="mod_ImpegnoSmall" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<div class="ui-mini" style="margin: -10px; padding: 0em;">
<uc1:mod_squadre runat="server" ID="mod_squadre" />
<div class="ui-mini" style="margin: 1px; padding: 0px;">
<uc1:mod_consegne runat="server" ID="mod_consegne" />
<uc1:mod_impegno runat="server" ID="mod_impegno" disableEdit="true" />
<uc1:mod_ImpegnoSmall runat="server" id="mod_ImpegnoSmall" />
<uc1:mod_dettInt runat="server" ID="mod_dettInt" disableEdit="true" />
</div>
</asp:Content>
+2 -2
View File
@@ -30,12 +30,12 @@ namespace WebSCR
{
mod_consegne.Visible = true;
mod_dettInt.Visible = false;
mod_impegno.Visible = false;
mod_ImpegnoSmall.Visible = false;
if (qsVal("Data") != "")
{
if (qsVal("IdxImpegno") != "")
{
mod_impegno.Visible = true;
mod_ImpegnoSmall.Visible = true;
mod_dettInt.Visible = true;
mod_consegne.Visible = false;
}
+2 -11
View File
@@ -12,15 +12,6 @@ namespace WebSCR {
public partial class Squadra {
/// <summary>
/// mod_squadre control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_squadre mod_squadre;
/// <summary>
/// mod_consegne control.
/// </summary>
@@ -31,13 +22,13 @@ namespace WebSCR {
protected global::WebSCR.WebUserControls.mod_consegne mod_consegne;
/// <summary>
/// mod_impegno control.
/// mod_ImpegnoSmall control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_impegno mod_impegno;
protected global::WebSCR.WebUserControls.mod_ImpegnoSmall mod_ImpegnoSmall;
/// <summary>
/// mod_dettInt control.
+16 -8
View File
@@ -330,12 +330,12 @@
</Content>
<Content Include="Default.aspx" />
<Content Include="Interventi.aspx" />
<Content Include="Menu.aspx" />
<Content Include="Pianificazione.aspx" />
<Content Include="fonts\fontawesome-webfont.svg" />
<Content Include="Global.asax" />
<Content Include="jumper.aspx" />
<Content Include="NuovoImpegno.aspx" />
<Content Include="ResetSquadra.aspx" />
<Content Include="Scripts\jquery-1.7.1.intellisense.js" />
<Content Include="Scripts\jquery-1.7.1.js" />
<Content Include="Scripts\jquery-1.7.1.min.js" />
@@ -367,6 +367,7 @@
<Content Include="WebUserControls\mod_giornata.ascx" />
<Content Include="WebUserControls\mod_header.ascx" />
<Content Include="WebUserControls\mod_impegno.ascx" />
<Content Include="WebUserControls\mod_ImpegnoSmall.ascx" />
<Content Include="WebUserControls\mod_Interventi.ascx" />
<Content Include="WebUserControls\mod_pianificazione.ascx" />
<Content Include="WebUserControls\mod_squadre.ascx" />
@@ -413,6 +414,13 @@
<Compile Include="Interventi.aspx.designer.cs">
<DependentUpon>Interventi.aspx</DependentUpon>
</Compile>
<Compile Include="Menu.aspx.cs">
<DependentUpon>Menu.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Menu.aspx.designer.cs">
<DependentUpon>Menu.aspx</DependentUpon>
</Compile>
<Compile Include="Pianificazione.aspx.cs">
<DependentUpon>Pianificazione.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -445,13 +453,6 @@
<DependentUpon>NuovoImpegno.aspx</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResetSquadra.aspx.cs">
<DependentUpon>ResetSquadra.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="ResetSquadra.aspx.designer.cs">
<DependentUpon>ResetSquadra.aspx</DependentUpon>
</Compile>
<Compile Include="Setup.aspx.cs">
<DependentUpon>Setup.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -620,6 +621,13 @@
<Compile Include="WebUserControls\mod_impegno.ascx.designer.cs">
<DependentUpon>mod_impegno.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_ImpegnoSmall.ascx.cs">
<DependentUpon>mod_ImpegnoSmall.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_ImpegnoSmall.ascx.designer.cs">
<DependentUpon>mod_ImpegnoSmall.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_Interventi.ascx.cs">
<DependentUpon>mod_Interventi.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -0,0 +1,47 @@
<%@ 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">
<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>
<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>
<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>
</ItemTemplate>
</asp:FormView>
<asp:ObjectDataSource ID="odsImpegni" runat="server" OldValuesParameterFormatString="Original_{0}" SelectMethod="getByKey" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.ImpegniTableAdapter">
<SelectParameters>
<asp:QueryStringParameter DefaultValue="0" Name="IdxImpegno" QueryStringField="IdxImpegno" Type="Int32" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
@@ -0,0 +1,33 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebSCR.WebUserControls
{
public partial class mod_ImpegnoSmall : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
/// verifica se valore passato è NON NULLO
/// </summary>
/// <param name="dataInizio"></param>
/// <returns></returns>
public bool notNull(object dataInizio)
{
bool answ = false;
try
{
answ = dataInizio.ToString() != "";
}
catch
{ }
return answ;
}
}
}
+33
View File
@@ -0,0 +1,33 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace WebSCR.WebUserControls {
public partial class mod_ImpegnoSmall {
/// <summary>
/// frmViewImpegni 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.FormView frmViewImpegni;
/// <summary>
/// odsImpegni 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 odsImpegni;
}
}
+1 -1
View File
@@ -1,5 +1,5 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettInt.ascx.cs" Inherits="WebSCR.WebUserControls.mod_dettInt" %>
<div class="ui-field-contain" style="visibility: <%: isVisible %>;">
<div class="ui-field-contain" style="visibility: <%: isVisible %>; height: <%: visHeight %>;">
<div data-role="controlgroup" data-type="horizontal" data-mini="true" style="font-size: 0.9em; width: 90%;">
<asp:LinkButton ID="lbAdd" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-plus ui-btn-icon-right ui-btn-inline" runat="server" CausesValidation="False" Text="Task" OnClick="lbAdd_Click" />
<asp:DropDownList runat="server" ID="ddlTipoCons" DataSourceID="odsTipoCons" DataTextField="DescrConsegna" DataValueField="CodConsegna"></asp:DropDownList>
@@ -42,6 +42,22 @@ namespace WebSCR.WebUserControls
}
}
/// <summary>
/// determina altezza visibile
/// </summary>
public string visHeight
{
get
{
string answ = "1em";
if (disableEdit)
{
answ = "0px";
}
return answ;
}
}
/// <summary>
/// impegno corrente
/// </summary>
public int idxImpegno
+1 -2
View File
@@ -8,8 +8,7 @@
<li><a href="Setup" data-icon="gear" class='<%: liClass("Setup") %>'>Setup</a></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="ResetSquadra" data-icon="recycle" class='<%: liClass("Squadre") %>'>Reset Squadra</a></li>
<li><a href="Interventi" data-icon="mail" class='<%: liClass("Interventi") %>'>Gestione Interventi</a></li>
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadre") %>'>Squadre/Consegne</a></li>
</ul>
</div>
+13 -9
View File
@@ -1,15 +1,19 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_header.ascx.cs" Inherits="WebSCR.WebUserControls.mod_header" %>
<asp:Timer ID="Timer1" runat="server"></asp:Timer>
<div style="background-color: <%: colorSquadraCurr %>; font-size: 2em; text-align: center; margin: auto;">
WebSCR - <%: titolo %>
<div style="background-color: <%: colorSquadraCurr %>; min-height: 2.6em;">
<div style="font-size: 1.1em; text-align: center; margin: auto;">
WSC - <%: titolo %>
</div>
<div class="ui-btn-left">
<a href="Default" data-icon="home" class="ui-btn ui-shadow ui-corner-all ui-icon-lock ui-btn-icon-left ui-btn-inline">
<asp:Label ID="lblVers" runat="server" Font-Bold="false" /></a>
</div>
<div class="ui-btn-right">
<a href="UserAdmin" data-icon="lock" class="ui-btn ui-shadow ui-corner-all ui-icon-lock ui-btn-icon-right ui-btn-inline">&nbsp;</a>
</div>
</div>
<a href="Default" data-icon="home" class="ui-btn-left">
<asp:Label ID="lblVers" runat="server" Font-Bold="false" /></a>
<div class="ui-btn-right">
<%--<asp:LinkButton runat="server" ID="lbtResetSquadra" CssClass="ui-btn ui-shadow ui-corner-all ui-icon-recycle ui-btn-icon-right ui-btn-inline" Text="Reset Squadra" OnClick="lbtResetSquadra_Click" OnClientClick="return confirm('Sei sicuro di voler resettare la selezione della squadra?')"/>--%>
<a href="UserAdmin" data-icon="lock" class="ui-btn ui-shadow ui-corner-all ui-icon-lock ui-btn-icon-right ui-btn-inline">&nbsp;</a>
</div>
<div id="headData">
<div id="headData" style="clear: both;">
<div style="float: right; font-size: 0.7em; font-weight: 100; margin-right: 4px;">
<%: CognomeNome %>
</div>
-24
View File
@@ -129,9 +129,6 @@ namespace WebSCR.WebUserControls
// se c'è e non è expired
showSel = false;
}
#if false
lbtResetSquadra.Visible = !showSel;
#endif
}
/// <summary>
/// verifica che la pagina sia tra quelle autorizzate x l'utente
@@ -246,26 +243,5 @@ namespace WebSCR.WebUserControls
memLayer.ML.setCookieVal(memLayer.ML.confReadString("AuthCookieName"), "");
memLayer.ML.emptyCookieVal(memLayer.ML.confReadString("AuthCookieName"));
}
#if false
/// <summary>
/// in caso di richiesta reset elimina cookie delal squadra selezionata
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbtResetSquadra_Click(object sender, EventArgs e)
{
memLayer.ML.emptyCookieVal("colorSquadraCurr");
memLayer.ML.emptyCookieVal("SquadraCurr");
memLayer.ML.emptyCookieVal("CodSquadra");
memLayer.ML.emptyCookieVal("DataRif");
memLayer.ML.emptyCookieVal("NumGg");
memLayer.ML.emptyCookieVal("Data");
memLayer.ML.emptyCookieVal("IdxImpegno");
memLayer.ML.emptyCookieVal("CodCliente");
memLayer.ML.emptyCookieVal("Indir");
memLayer.ML.emptySessionVal("Cliente");
Response.Redirect(devicesAuthProxy.pagCorrente);
}
#endif
}
}
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.