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

Prosegue, compila ma errore in update x la due date, rifare mostrando un controllo e poi permettere da quello insert dei valori data/ora

Browse Source 
git-svn-id: https://keyhammer.ath.cx/svn/XPS/trunk@32 43c8e981-f90d-406c-a89a-24a2c4268d51
This commit is contained in:
samuele
2008-10-28 16:30:40 +00:00
parent e58d365b34
commit abbe28db8f
14 changed files with 141 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XPS/Appunti.txt
+21 -3
View File
@@ -9,9 +9,27 @@ OK - inserire voci in mantis varie
- una vista x ogni funzione
OK - magazzino
- produzione
- realizzare allocazione risorse
- realizzare allocazione risorse (data)
--> FARE con select al posto di update, override con click method e lasciare selected + mostrare un panle con i dettagli data/ora e pulsante di salvataggio che prende selected + altro x salvare query...
OK - segreteria
OK - admin (da magazzino... con altri editing & co...)
- barcode da web?
- avanzamento stato: obj mamma ha stato min tra i vari child
-
- avanzamento stato: obj mamma ha stato min tra i vari child... + in visualizzazione mostrare stato min e Max
------------------------------------------------
- 20081024
------------------------------------------------
- BUG:
- errore numerazione righe e ULP...
OK - dettaglio rimanda sempre a scheda direzione e non a quella di provenienza, ToFix!
- migliorare interfaccia x navigazione dettagli con
OK - 2 label
- icone diverse?!?
- cosa può fare ogni funzione?
- magazzino: crea, aggiunge righe/ULP e cancella e modifica descrizione fino a quando approva, poi è fuori dal gioco...
- indica spedito con barcode
...
- direzione:
- prod:
- segreteria:
XPS/elencoComm.aspx.cs
+2 -1
View File
@@ -13,12 +13,13 @@ public partial class elencoComm : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
Mod_elencoComm1.currMode = modoElenco.direzione;
Mod_elencoComm1.currMode = modoXPS_Equa.direzione;
Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
}
void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("returnPage", Request.Url.AbsolutePath);
Response.Redirect("detComm.aspx");
}
}
XPS/elencoCommMag.aspx
+3
View File
@@ -1,8 +1,11 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommMag.aspx.cs" Inherits="elencoCommMag" %>
<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
<%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
</asp:Content>
XPS/elencoCommMag.aspx.cs
+2 -1
View File
@@ -8,12 +8,13 @@ public partial class elencoCommMag : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
Mod_elencoComm1.currMode = modoElenco.magazzino;
Mod_elencoComm1.currMode = modoXPS_Equa.magazzino;
Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
}
void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("returnPage", Request.Url.AbsolutePath);
Response.Redirect("detComm.aspx");
}
}
XPS/elencoCommProd.aspx
+7 -5
View File
@@ -1,7 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommProd.aspx.cs" Inherits="elencoCommProd" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true"
CodeFile="elencoCommProd.aspx.cs" Inherits="elencoCommProd" %>
<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<%@ Register Src="mod_elencoComm.ascx" TagName="mod_elencoComm" TagPrefix="uc1" %>
<%@ Register Src="mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
</asp:Content>
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
</asp:Content>
XPS/elencoCommProd.aspx.cs
+2 -1
View File
@@ -8,12 +8,13 @@ public partial class elencoCommProd : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
Mod_elencoComm1.currMode = modoElenco.produzione;
Mod_elencoComm1.currMode = modoXPS_Equa.produzione;
Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
}
void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("returnPage", Request.Url.AbsolutePath);
Response.Redirect("detComm.aspx");
}
}
XPS/elencoCommSegr.aspx
+7 -5
View File
@@ -1,7 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="elencoCommSegr.aspx.cs" Inherits="elencoCommSegr" %>
<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true"
CodeFile="elencoCommSegr.aspx.cs" Inherits="elencoCommSegr" %>
<%@ Register src="mod_elencoComm.ascx" tagname="mod_elencoComm" tagprefix="uc1" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<%@ Register Src="mod_elencoComm.ascx" TagName="mod_elencoComm" TagPrefix="uc1" %>
<%@ Register Src="mod_fixCal.ascx" TagName="mod_fixCal" TagPrefix="uc2" %>
<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<uc1:mod_elencoComm ID="Mod_elencoComm1" runat="server" />
</asp:Content>
<uc2:mod_fixCal ID="mod_fixCal1" runat="server" />
</asp:Content>
XPS/elencoCommSegr.aspx.cs
+2 -1
View File
@@ -8,12 +8,13 @@ public partial class elencoCommSegr : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
Mod_elencoComm1.currMode = modoElenco.segreteria;
Mod_elencoComm1.currMode = modoXPS_Equa.segreteria;
Mod_elencoComm1.eh_selValore += new EventHandler(Mod_elencoComm1_eh_selValore);
}
void Mod_elencoComm1_eh_selValore(object sender, EventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("returnPage", Request.Url.AbsolutePath);
Response.Redirect("detComm.aspx");
}
}
XPS/mod_ULP.ascx
+1 -4
View File
@@ -2,6 +2,7 @@
<%@ Register Src="mod_filtro.ascx" TagName="mod_filtro" TagPrefix="uc1" %>
<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
<%@ Register Src="mod_navPath.ascx" TagName="mod_navPath" TagPrefix="uc2" %>
<asp:Label runat="server" ID="lblULP" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
OnDataBound="grView_DataBound" OnRowUpdating="grView_RowUpdating" OnRowUpdated="grView_RowUpdated">
@@ -19,12 +20,8 @@
<Columns>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
<%--<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click"
Visible="true" />--%>
</HeaderTemplate>
<ItemTemplate>
<%--<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />--%>
<asp:ImageButton ID="imgClona" runat="server" CausesValidation="False" ToolTip='<%# traduci("clonaRow") %>'
ImageUrl='<%# imgPath(SteamWare.tipoImg.clona , SteamWare.dimImg.small) %>' CommandArgument="clonaObj"
Visible='<%# userCanDel(Eval("CodStato")) %>' CommandName="Update" OnClick="imgClonaRow_Click" />
XPS/mod_ULP.ascx.cs
+1 -8
View File
@@ -141,14 +141,7 @@ public partial class mod_ULP : ApplicationUserControl
protected override void traduciObj()
{
base.traduciObj();
#if false
btnShowNew.Text = traduci("btnShowNew");
btnNewComm.Text = traduci("btnNewComm");
lblCli.Text = traduci("lblCli");
lblNomeComm.Text = traduci("lblNomeComm");
lblNumDDT.Text = traduci("lblNumDDT");
lblDescr.Text = traduci("lblDescr");
#endif
lblULP.Text = traduci("lblULP");
}
/// <summary>
XPS/mod_dettComm.ascx
+1
View File
@@ -6,6 +6,7 @@
<div class="navBar">
<uc2:mod_navPath ID="mod_navPath1" runat="server" EnableViewState="true" separatore=">" />
</div>
<asp:Label runat="server" ID="lblRowsDDT" />
<asp:GridView ID="grView" runat="server" AutoGenerateColumns="False" DataSourceID="ods"
DataKeyNames="Cod" AllowPaging="True" AllowSorting="True" OnSelectedIndexChanged="grView_SelectedIndexChanged"
OnDataBound="grView_DataBound" onrowupdating="grView_RowUpdating">
XPS/mod_dettComm.ascx.cs
+22 -11
View File
@@ -129,7 +129,10 @@ public partial class mod_dettComm : ApplicationUserControl
DataColumnCollection colonne = tabella.Columns;
return colonne;
}
/// <summary>
/// modo d'uso PRIVATE del controllo tra i vari magazzino/segreteria/produzione/direzione
/// </summary>
protected modoXPS_Equa _currMode = modoXPS_Equa.segreteria;
/// <summary>
/// inizializzazione valori di default
/// </summary>
@@ -140,6 +143,7 @@ public partial class mod_dettComm : ApplicationUserControl
_idxGridView = "CodRow";
updateNavBar();
}
/// <summary>
/// aggiorno navbar
/// </summary>
@@ -148,25 +152,18 @@ public partial class mod_dettComm : ApplicationUserControl
// verifico se c'è selezione, attivo filtraggio ed aggiorno...
if (memLayer.ML.isInSessionObject("CodDDT_sel"))
{
mod_navPath1.valore = SteamWare.memLayer.ML.StringSessionObj("CodDDT_sel");
mod_navPath1.valore = memLayer.ML.StringSessionObj("CodDDT_sel");
mod_navPath1.tooltip = traduci("go2commesse");
// traduco...
mod_navPath1.linkText = traduci("ElencoComm");
mod_navPath1.linkURL = "./elencoComm.aspx";
mod_navPath1.linkURL = memLayer.ML.StringSessionObj("returnPage");
}
}
protected override void traduciObj()
{
base.traduciObj();
#if false
btnShowNew.Text = traduci("btnShowNew");
btnNewComm.Text = traduci("btnNewComm");
lblCli.Text = traduci("lblCli");
lblNomeComm.Text = traduci("lblNomeComm");
lblNumDDT.Text = traduci("lblNumDDT");
lblDescr.Text = traduci("lblDescr");
#endif
lblRowsDDT.Text = traduci("lblRowsDDT");
}
/// <summary>
@@ -328,6 +325,20 @@ public partial class mod_dettComm : ApplicationUserControl
{
return isAccettVisible(codStato);
}
/// <summary>
/// imposta il modo d'uso del controllo tra i vari magazzino/segreteria/produzione/direzione
/// </summary>
public modoXPS_Equa currMode
{
get
{
return _currMode;
}
set
{
_currMode = value;
}
}
#endregion
}
XPS/mod_elencoComm.ascx
+46 -18
View File
@@ -90,25 +90,18 @@
<ItemTemplate>
<asp:ImageButton ID="imgSelect" runat="server" CausesValidation="False" CommandName="Select"
ToolTip='<%# traduci("Select") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.seleziona, SteamWare.dimImg.small) %>' />
<asp:ImageButton ID="imgAccetta" runat="server" CausesValidation="False" CommandName="Update"
OnClick="imgAccetta_Click" ToolTip='<%# traduci("AccettaObjXps")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.small) %>'
Visible='<%# isAccettVisible(Eval("CodStato")) %>' />
<cc1:ConfirmButtonExtender ID="cbeAccetta" runat="server" ConfirmText='<%# traduci("confermaAccettaObjXps")%>'
TargetControlID="imgAccetta">
</cc1:ConfirmButtonExtender>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Cliente" HeaderText="Cliente" SortExpression="Cliente" />
<asp:BoundField DataField="Cliente" HeaderText="Cliente" SortExpression="Cliente"
ReadOnly="true" />
<asp:TemplateField HeaderText="DDT" SortExpression="DDT">
<ItemTemplate>
<asp:Label ID="Label3" runat="server" Text='<%# Bind("DDT") %>' ToolTip='<%# Eval("Cod")%>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="DataDDT" HeaderText="DataDDT" SortExpression="DataDDT"
DataFormatString="{0:dd/MM/yy}" />
ReadOnly="true" DataFormatString="{0:dd/MM/yy}" />
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
</HeaderTemplate>
<ItemTemplate>
<asp:HyperLink runat="server" ID="lnkPDF" ImageUrl="~/images/table.png" NavigateUrl='<%# XPS.obj.urlReport(Eval("Cod"),"label","") %>'
Target="_blank" ToolTip='<%# traduci("anteprimaBarcode") %>' />
@@ -116,17 +109,46 @@
Target="_blank" ToolTip='<%# traduci("stampaBarcode") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="CodStato" />
<asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione" />
<asp:BoundField DataField="Stato" HeaderText="Stato" SortExpression="CodStato" ReadOnly="true" />
<asp:TemplateField>
<ItemTemplate>
<asp:ImageButton ID="imgAccetta" runat="server" CausesValidation="False" CommandName="Update"
OnClick="imgAccetta_Click" ToolTip='<%# traduci("AccettaObjXps")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.small) %>'
Visible='<%# isAccettVisible(Eval("CodStato")) %>' />
<cc1:ConfirmButtonExtender ID="cbeAccetta" runat="server" ConfirmText='<%# traduci("confermaAccettaObjXps")%>'
TargetControlID="imgAccetta">
</cc1:ConfirmButtonExtender>
<asp:ImageButton ID="imgSchedulaTutto" runat="server" CausesValidation="False" CommandName="Edit"
ToolTip='<%# traduci("SchedulaObjXps")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.modifica , SteamWare.dimImg.small) %>'
Visible='<%# isSchedulaVisible(Eval("CodStato")) %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:BoundField DataField="descrizione" HeaderText="descrizione" SortExpression="descrizione"
ReadOnly="true" />
<asp:BoundField DataField="Peso" HeaderText="Peso" ReadOnly="True" SortExpression="Peso"
DataFormatString="{0:N2} kg" />
<asp:BoundField DataField="Righe" HeaderText="Righe" SortExpression="Righe" />
<asp:BoundField DataField="Qta" HeaderText="Qta" SortExpression="Qta" />
<asp:BoundField DataField="Colli" HeaderText="Colli" SortExpression="Colli" />
<asp:BoundField DataField="Righe" HeaderText="Righe" SortExpression="Righe" ReadOnly="true" />
<asp:BoundField DataField="Qta" HeaderText="Qta" SortExpression="Qta" ReadOnly="true" />
<asp:BoundField DataField="Colli" HeaderText="Colli" SortExpression="Colli" ReadOnly="true" />
<asp:BoundField DataField="DataArrivo" HeaderText="DataArrivo" SortExpression="DataArrivo"
DataFormatString="{0:dd/MM/yy HH:mm}" />
<asp:BoundField DataField="DataPrevista" HeaderText="DataPrevista" SortExpression="DataPrevista"
DataFormatString="{0:dd/MM/yy HH:mm}" />
ReadOnly="true" DataFormatString="{0:dd/MM/yy HH:mm}" />
<asp:TemplateField HeaderText="DataPrevista" SortExpression="DataPrevista">
<EditItemTemplate>
<asp:Label runat="server" ID="lblDataPrev" Text='<%# traduci("updateAllObjChild") %>' CssClass="notaMargine" /><br />
<asp:TextBox ID="txtDueDate" runat="server" Text='<%# Bind("DataPrevista","dd/MM/yyyy") %>' Width="6em" />
<%--<asp:RequiredFieldValidator ID="rfvDueDate" runat="server" ErrorMessage="!!!" ControlToValidate="txtDueDate" />--%>
<cc1:CalendarExtender ID="ce_DueDate" runat="server" FirstDayOfWeek="Monday" TargetControlID="txtDueDate"
Format="dd/MM/yyyy">
</cc1:CalendarExtender>
<asp:DropDownList runat="server" ID="ddlOra" >
<asp:ListItem Value="11">11:00</asp:ListItem>
<asp:ListItem Value="16">16:00</asp:ListItem>
</asp:DropDownList>
</EditItemTemplate>
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# Bind("DataPrevista", "{0:dd/MM/yy HH:mm}") %>'></asp:Label>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
<HeaderTemplate>
</HeaderTemplate>
@@ -138,6 +160,12 @@
TargetControlID="imgDelete">
</cc1:ConfirmButtonExtender>
</ItemTemplate>
<EditItemTemplate>
<asp:ImageButton ID="imgUpdate" runat="server" CausesValidation="False" CommandName="Update"
ToolTip='<%# traduci("Update")%>' ImageUrl='<%# imgPath(SteamWare.tipoImg.conferma , SteamWare.dimImg.small) %>' />
<asp:ImageButton ID="imgCancel" runat="server" CausesValidation="False" CommandName="Cancel"
ToolTip='<%# traduci("Cancel") %>' ImageUrl='<%# imgPath(SteamWare.tipoImg.annulla , SteamWare.dimImg.small) %>' />
</EditItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
XPS/mod_elencoComm.ascx.cs
+24 -11
View File
@@ -142,7 +142,7 @@ public partial class mod_elencoComm : ApplicationUserControl
/// <summary>
/// modo d'uso PRIVATE del controllo tra i vari magazzino/segreteria/produzione/direzione
/// </summary>
protected modoElenco _currMode = modoElenco.segreteria;
protected modoXPS_Equa _currMode = modoXPS_Equa.segreteria;
/// <summary>
/// inizializzazione valori di default
@@ -175,7 +175,7 @@ public partial class mod_elencoComm : ApplicationUserControl
private void fixControlliDaModoCorrente()
{
// mostro nutton new SOLO se in stato magazzino/direzione...
if (currMode == modoElenco.magazzino || currMode == modoElenco.direzione)
if (currMode == modoXPS_Equa.magazzino || currMode == modoXPS_Equa.direzione)
{
btnShowNew.Visible = true;
}
@@ -283,6 +283,7 @@ public partial class mod_elencoComm : ApplicationUserControl
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", "accettaObj");
}
/// <summary>
/// in caso di aggiornamento verifico se sia salvato un comando accetta...
/// </summary>
@@ -311,7 +312,10 @@ public partial class mod_elencoComm : ApplicationUserControl
e.Cancel = true;
break;
default:
// faccio update!
// significa che mi chiedono di imposstare la data a tutti i child...
DateTime dueDate = Convert.ToDateTime(((TextBox)grView.FindControl("txtDueDate")).Text).AddHours(Convert.ToInt32(((DropDownList)grView.FindControl("ddlOra")).SelectedValue));
XPS.obj.taObj.updateDueDateULP(dueDate, user_std.UtSn.utente, DateTime.Now, idxObj.Replace("D", "%"));
// annullo poi update...
e.Cancel = true;
break;
}
@@ -327,6 +331,22 @@ public partial class mod_elencoComm : ApplicationUserControl
if (codStato.ToString().IndexOf("01") < 0) answ = false;
return answ;
}
/// <summary>
/// restituisce se sia visibile il controllo di edit x schedulare in blocco tutto (oggetto, righe, ULP...)
/// </summary>
/// <param name="codStato"></param>
/// <returns></returns>
public bool isSchedulaVisible(object codStato)
{
bool answ = true;
if (codStato.ToString().IndexOf("02") < 0) answ = false;
// controllo se sono su visualizzazione produzione...
if (currMode != modoXPS_Equa.produzione) answ = false;
return answ;
}
//
/// <summary>
/// determina se l'utente possa cancellare, x ora sempre si...
/// </summary>
@@ -344,7 +364,7 @@ public partial class mod_elencoComm : ApplicationUserControl
/// <summary>
/// imposta il modo d'uso del controllo tra i vari magazzino/segreteria/produzione/direzione
/// </summary>
public modoElenco currMode
public modoXPS_Equa currMode
{
get
{
@@ -359,10 +379,3 @@ public partial class mod_elencoComm : ApplicationUserControl
#endregion
}
public enum modoElenco
{
magazzino,
segreteria,
produzione,
direzione
}