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

Inserita prima versioen apgina IntSquadre

Browse Source
This commit is contained in:
Samuele E. Locatelli
2015-09-29 18:16:08 +02:00
parent b82dcec1a2
commit fd84b5f3e5
20 changed files with 98 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/WebSCR/v14/.suo
BIN
View File
Binary file not shown.
WebSCR/IntSquadra.aspx
-6
View File
@@ -1,6 +0,0 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="IntSquadra.aspx.cs" Inherits="WebSCR.IntSquadra" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
mettere interventi (semplificati...)
</asp:Content>
WebSCR/IntSquadra.aspx.cs
-17
View File
@@ -1,17 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebSCR
{
public partial class IntSquadra : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
WebSCR/IntSquadra.aspx.designer.cs
Generated
-17
View File
@@ -1,17 +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 IntSquadra
{
}
}
WebSCR/IntSquadre.aspx
+9
View File
@@ -0,0 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/JQMob.Master" AutoEventWireup="true" CodeBehind="IntSquadre.aspx.cs" Inherits="WebSCR.IntSquadre" %>
<%@ Register Src="~/WebUserControls/mod_Interventi.ascx" TagPrefix="uc1" TagName="mod_Interventi" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_Interventi runat="server" ID="mod_Interventi" showSelSquadre="false" />
</asp:Content>
WebSCR/IntSquadre.aspx.cs
+27
View File
@@ -0,0 +1,27 @@
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace WebSCR
{
public partial class IntSquadre : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
// imposto a filtro suadre la squadra selezionata...
string squadra = memLayer.ML.getCookieVal("CodSquadra");
if (squadra != "")
{
memLayer.ML.setSessionVal("elencoSquadre", squadra);
}
}
}
}
}
WebSCR/IntSquadre.aspx.designer.cs
Generated
+24
View File
@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <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 IntSquadre {
/// <summary>
/// mod_Interventi control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_Interventi mod_Interventi;
}
}
WebSCR/Interventi.aspx
+1 -1
View File
@@ -5,7 +5,7 @@
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="server">
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="server">
<uc1:mod_Interventi ID="mod_Interventi1" runat="server" />
<uc1:mod_Interventi ID="mod_Interventi1" runat="server" showSelSquadre="true" />
<div data-role="listview" data-inset="true">
<div class="ui-field-contain">
<uc1:mod_impegno runat="server" ID="mod_impegno" />
WebSCR/Squadra.aspx
+2 -2
View File
@@ -3,7 +3,7 @@
<%@ Register Src="~/WebUserControls/mod_consegne.ascx" TagPrefix="uc1" TagName="mod_consegne" %>
<%@ Register Src="~/WebUserControls/mod_dettInt.ascx" TagPrefix="uc1" TagName="mod_dettInt" %>
<%@ Register Src="~/WebUserControls/mod_ImpegnoSmall.ascx" TagPrefix="uc1" TagName="mod_ImpegnoSmall" %>
<%@ Register Src="~/WebUserControls/mod_gestIntSquadra.ascx" TagPrefix="uc1" TagName="mod_gestIntSquadra" %>
<%@ Register Src="~/WebUserControls/mod_gestIntSquadre.ascx" TagPrefix="uc1" TagName="mod_gestIntSquadre" %>
<%@ Register Src="~/WebUserControls/mod_fileUpload.ascx" TagPrefix="uc1" TagName="mod_fileUpload" %>
<%@ Register Src="~/WebUserControls/mod_selData.ascx" TagPrefix="uc1" TagName="mod_selData" %>
@@ -15,7 +15,7 @@
<div class="ui-mini" style="margin: 2px; padding: 2px;">
<uc1:mod_selData runat="server" id="mod_selData" />
<uc1:mod_consegne runat="server" ID="mod_consegne" />
<uc1:mod_gestIntSquadra runat="server" ID="mod_gestIntSquadra" />
<uc1:mod_gestIntSquadre runat="server" ID="mod_gestIntSquadre" />
<uc1:mod_ImpegnoSmall runat="server" ID="mod_ImpegnoSmall" />
<div id="divFile" runat="server" style="text-align: center; margin: 2px auto; padding: 2px; border: 1px solid #333333;" class="ui-shadow ui-corner-all">
<uc1:mod_fileUpload runat="server" ID="mod_fileUpload" enableMod="true" />
WebSCR/Squadra.aspx.cs
+4 -4
View File
@@ -13,7 +13,7 @@ namespace WebSCR
protected void Page_Load(object sender, EventArgs e)
{
fixVisibility();
mod_gestIntSquadra.eh_update += mod_gestIntSquadra_eh_update;
mod_gestIntSquadre.eh_update += mod_gestIntSquadre_eh_update;
mod_selData.eh_update += Mod_selData_eh_update;
}
@@ -28,7 +28,7 @@ namespace WebSCR
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
void mod_gestIntSquadra_eh_update(object sender, EventArgs e)
void mod_gestIntSquadre_eh_update(object sender, EventArgs e)
{
mod_dettInt.doUpdate();
mod_ImpegnoSmall.doUpdate();
@@ -51,12 +51,12 @@ namespace WebSCR
mod_dettInt.Visible = false;
mod_ImpegnoSmall.Visible = false;
divFile.Visible = false;
mod_gestIntSquadra.Visible = false;
mod_gestIntSquadre.Visible = false;
if (qsVal("Data") != "")
{
if (qsVal("IdxImpegno") != "")
{
mod_gestIntSquadra.Visible = true;
mod_gestIntSquadre.Visible = true;
mod_ImpegnoSmall.Visible = true;
mod_dettInt.Visible = true;
divFile.Visible = true;
WebSCR/Squadra.aspx.designer.cs
Generated
+2 -2
View File
@@ -31,13 +31,13 @@ namespace WebSCR {
protected global::WebSCR.WebUserControls.mod_consegne mod_consegne;
/// <summary>
/// mod_gestIntSquadra control.
/// mod_gestIntSquadre control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::WebSCR.WebUserControls.mod_gestIntSquadra mod_gestIntSquadra;
protected global::WebSCR.WebUserControls.mod_gestIntSquadre mod_gestIntSquadre;
/// <summary>
/// mod_ImpegnoSmall control.
WebSCR/WebSCR.csproj
+10 -10
View File
@@ -357,7 +357,7 @@
<Content Include="favicon.ico" />
<Content Include="images\LogoSteamware.png" />
<Content Include="Interventi.aspx" />
<Content Include="IntSquadra.aspx" />
<Content Include="IntSquadre.aspx" />
<Content Include="Menu.aspx" />
<Content Include="OrdiniPerData.aspx" />
<Content Include="Pianificazione.aspx" />
@@ -413,7 +413,7 @@
<Content Include="WebUserControls\mod_filtroPeriodo.ascx" />
<Content Include="WebUserControls\mod_filtroZona.ascx" />
<Content Include="WebUserControls\mod_footer.ascx" />
<Content Include="WebUserControls\mod_gestIntSquadra.ascx" />
<Content Include="WebUserControls\mod_gestIntSquadre.ascx" />
<Content Include="WebUserControls\mod_giornata.ascx" />
<Content Include="WebUserControls\mod_header.ascx" />
<Content Include="WebUserControls\mod_impegno.ascx" />
@@ -479,12 +479,12 @@
<Compile Include="Interventi.aspx.designer.cs">
<DependentUpon>Interventi.aspx</DependentUpon>
</Compile>
<Compile Include="IntSquadra.aspx.cs">
<DependentUpon>IntSquadra.aspx</DependentUpon>
<Compile Include="IntSquadre.aspx.cs">
<DependentUpon>IntSquadre.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="IntSquadra.aspx.designer.cs">
<DependentUpon>IntSquadra.aspx</DependentUpon>
<Compile Include="IntSquadre.aspx.designer.cs">
<DependentUpon>IntSquadre.aspx</DependentUpon>
</Compile>
<Compile Include="Menu.aspx.cs">
<DependentUpon>Menu.aspx</DependentUpon>
@@ -735,12 +735,12 @@
<Compile Include="WebUserControls\mod_footer.ascx.designer.cs">
<DependentUpon>mod_footer.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_gestIntSquadra.ascx.cs">
<DependentUpon>mod_gestIntSquadra.ascx</DependentUpon>
<Compile Include="WebUserControls\mod_gestIntSquadre.ascx.cs">
<DependentUpon>mod_gestIntSquadre.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_gestIntSquadra.ascx.designer.cs">
<DependentUpon>mod_gestIntSquadra.ascx</DependentUpon>
<Compile Include="WebUserControls\mod_gestIntSquadre.ascx.designer.cs">
<DependentUpon>mod_gestIntSquadre.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_giornata.ascx.cs">
<DependentUpon>mod_giornata.ascx</DependentUpon>
WebSCR/WebUserControls/mod_Interventi.ascx
-11
View File
@@ -58,17 +58,6 @@
</div>
<div class="ui-block-c" style="text-align: right; margin: auto;">
<uc1:mod_selSquadre runat="server" ID="mod_selSquadre" />
<%--<div class="flLeft" style="font-size: 0.85em;">
<asp:Button runat="server" ID="btnAllSquadre" Text="Squadre (tutte)" OnClick="btnAllSquadre_Click" />
</div>
<div class="flLeft" style="font-size: 0.85em;">
<div data-role="controlgroup" data-type="horizontal" class="ui-controlgroup ui-controlgroup-horizontal ui-corner-all">
<asp:RadioButtonList ID="rblSquadre" runat="server" DataSourceID="odsSquadre" DataTextField="CodSquadra" DataValueField="CodSquadra" RepeatDirection="Horizontal" RepeatLayout="Flow" AppendDataBoundItems="false" AutoPostBack="True" OnSelectedIndexChanged="rblSquadre_SelectedIndexChanged">
<asp:ListItem Selected="True" Text="Tutte" Value="*"></asp:ListItem>
</asp:RadioButtonList>
</div>
<asp:ObjectDataSource ID="odsSquadre" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.AnagSquadreTableAdapter"></asp:ObjectDataSource>
</div>--%>
</div>
</div>
<div class="ui-mini">
WebSCR/WebUserControls/mod_Interventi.ascx.cs
+14 -2
View File
@@ -112,8 +112,20 @@ namespace WebSCR.WebUserControls
/// ultimo comando letto da link button
/// </summary>
public string lastCmd { get; set; }
/// <summary>
/// determina visibilità selettore squadre
/// </summary>
public bool showSelSquadre
{
get
{
return mod_selSquadre.Visible;
}
set
{
mod_selSquadre.Visible = value;
}
}
/// <summary>
/// aggiungo/tolgo all'intervallo selezione
/// </summary>
WebSCR/WebUserControls/mod_gestIntSquadra.ascx → WebSCR/WebUserControls/mod_gestIntSquadre.ascx
+1 -1
View File
@@ -1,4 +1,4 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadra.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadra" %>
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_gestIntSquadre.ascx.cs" Inherits="WebSCR.WebUserControls.mod_gestIntSquadre" %>
<asp:HiddenField runat="server" ClientIDMode="Static" ID="hLat" />
<asp:HiddenField runat="server" ClientIDMode="Static" ID="hLon" />
WebSCR/WebUserControls/mod_gestIntSquadra.ascx.cs → WebSCR/WebUserControls/mod_gestIntSquadre.ascx.cs
+1 -1
View File
@@ -9,7 +9,7 @@ using WebSCR_data;
namespace WebSCR.WebUserControls
{
public partial class mod_gestIntSquadra : System.Web.UI.UserControl
public partial class mod_gestIntSquadre : System.Web.UI.UserControl
{
public event EventHandler eh_update;
/// <summary>
WebSCR/WebUserControls/mod_gestIntSquadra.ascx.designer.cs → WebSCR/WebUserControls/mod_gestIntSquadre.ascx.designer.cs
Generated
+1 -1
View File
@@ -10,7 +10,7 @@
namespace WebSCR.WebUserControls {
public partial class mod_gestIntSquadra {
public partial class mod_gestIntSquadre {
/// <summary>
/// hLat control.
WebSCR/WebUserControls/mod_header.ascx
+1 -1
View File
@@ -23,7 +23,7 @@
<asp:HyperLink runat="server" ID="hlLocalUploader" Text="Aggiornamento Anagrafiche" Target="_blank" CssClass="ui-mini ui-btn ui-shadow ui-corner-all ui-icon-action" /></li>
</ul>
<ul runat="server" id="ulSquadra" visible="false">
<li><a href="IntSquadra" data-icon="mail" class='<%: liClass("IntSquadra") %>'>Gestione Interventi</a></li>
<li><a href="IntSquadre" data-icon="mail" class='<%: liClass("IntSquadre") %>'>Gestione Interventi</a></li>
<li><a href="Menu" data-icon="home" class='<%: liClass("Menu") %>'>Menu Squadre</a></li>
<li><a href="Squadra" data-icon="navigation" class='<%: liClass("Squadra") %>'>Squadre/Consegne</a></li>
</ul>
WebSCR/WebUserControls/mod_header.ascx.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace WebSCR.WebUserControls
ulSquadra.Visible = false;
ulMagazzino.Visible = true;
}
else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadra" || devicesAuthProxy.pagCorrente == "Menu")
else if(devicesAuthProxy.pagCorrente == "Squadra" || devicesAuthProxy.pagCorrente == "IntSquadre" || devicesAuthProxy.pagCorrente == "Menu")
{
ulStd.Visible = false;
ulSquadra.Visible = true;
WebSCR/bin/WebSCR.dll
BIN
View File
Binary file not shown.