aggiunto blocco spostamento se non c'è matricola OP...

This commit is contained in:
Samuele E. Locatelli
2016-01-20 18:27:10 +01:00
parent fb20068857
commit 5b5ddd43cd
17 changed files with 77 additions and 14 deletions
Binary file not shown.
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.067.294")]
[assembly: AssemblyFileVersion("2.0.067.294")]
[assembly: AssemblyVersion("2.0.077.294")]
[assembly: AssemblyFileVersion("2.0.077.294")]
[assembly: AssemblyCopyright("Steamware © 2015-2016")]
[assembly: AssemblyCompany("Steamware")]
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("2.0.067.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.067.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("2.0.077.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("2.0.077.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2015-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+
Binary file not shown.
Binary file not shown.
Binary file not shown.
+4 -2
View File
@@ -34,15 +34,17 @@
ShowEventStartEnd="True"
CellHeight="15"
TimeRangeSelectedHandling="JavaScript"
EventMoveHandling="CallBack"
TimeRangeSelectedJavaScript="newRange(start,end)"
EventClickHandling="JavaScript"
EventClickJavaScript="eventClick(e)"
Theme="calendar_white"
EventMoveHandling="CallBack"
OnEventMove="DayPilotCalendar1_EventMove"
OnBeforeEventRender="DayPilotCalendar1_BeforeEventRender"
Width="95%"
HourFontSize="6"
DayFontSize="8pt"
EventFontSize="7pt" Days="5" OnEventClick="DayPilotCalendar1_EventClick" OnEventMove="DayPilotCalendar1_EventMove" OnTimeRangeSelected="DayPilotCalendar1_TimeRangeSelected" TimeRangeSelectedJavaScript="newRange(start,end)"></DayPilot:DayPilotCalendar>
EventFontSize="7pt" Days="5"></DayPilot:DayPilotCalendar>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByDate" TypeName="WebSCR_data.DS_ApplicazioneTableAdapters.v_ImpegniCalTableAdapter">
<SelectParameters>
<asp:ControlParameter ControlID="lblData" Name="Data" PropertyName="Text" Type="DateTime" />
+20 -5
View File
@@ -87,9 +87,24 @@ namespace WebSCR.WebUserControls
}
protected void DayPilotCalendar1_EventMove(object sender, DayPilot.Web.Ui.Events.EventMoveEventArgs e)
{
// sposto evento!
DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart);
doUpdate();
// controllo che sia presente matricola altrimenti NON lo permetto...
if (matrOp != "")
{
// sposto evento!
DtProxy.man.taImp.updStart(Convert.ToInt32(e.Id), e.NewStart);
if (memLayer.ML.confReadBool("svuotaMatrOp"))
{
// rimuovo matrOp
memLayer.ML.emptySessionVal("matrOp");
errorMess = "spostamento effettuato";
}
doUpdate();
}
else
{
errorMess = "Attenzione manca matricola! prego selezionare prima di effettuare spostamento.";
//Response.Redirect(devicesAuthProxy.pagCorrente);
}
}
/// <summary>
/// anno selezionato
@@ -109,11 +124,11 @@ namespace WebSCR.WebUserControls
/// <summary>
/// anno selezionato
/// </summary>
public string errMessGiorn
public string errorMess
{
set
{
memLayer.ML.setSessionVal("errMessGiorn", value);
memLayer.ML.setSessionVal("errorMess", value);
}
}
@@ -99,11 +99,21 @@ namespace WebSCR.WebUserControls
if (qsVal("Action") == "NEW")
{
// creo NUOVO impegno
creaImpegno();
tryCreaImpegno();
// ricarico!!!
Response.Redirect(devicesAuthProxy.pagCorrente);
}
#if false
else if (qsVal("Action") == "MOVE")
{
// prova a spostare
tryMove();
// ricarico!!!
Response.Redirect(devicesAuthProxy.pagCorrente);
}
#endif
else if (qsVal("Action") == "EDIT")
{
errorMess = "EDIT";
@@ -135,6 +145,42 @@ namespace WebSCR.WebUserControls
}
}
#if false
private void tryMove()
{
// verifico di avere MatrOP selezionata
if (matrOp != "")
{
DateTime newStart = DateTime.Now;
DateTime adesso = newStart;
try
{
newStart = Convert.ToDateTime(qsVal("newStart"));
}
catch
{ }
int idxImpegno = 0;
try
{
idxImpegno = Convert.ToInt32(qsVal("IdxImpegno"));
}
catch
{ }
if (newStart != adesso)
{
if (idxImpegno > 0)
{
DtProxy.man.taImp.updStart(idxImpegno, newStart);
}
}
}
else
{
errorMess = "Prego indicare Matricola Operatore per procedere";
}
}
#endif
/// <summary>
/// anno selezionato
/// </summary>
@@ -213,7 +259,7 @@ namespace WebSCR.WebUserControls
/// <summary>
/// genera un nuovo impegno (oppure mostra warning...)
/// </summary>
private void creaImpegno()
private void tryCreaImpegno()
{
if (codSquadra != "")
{
@@ -12,7 +12,7 @@ namespace WebSCR.WebUserControls
public partial class mod_selSquadre : System.Web.UI.UserControl
{
/// <summary>
/// elenco squadre slezionate
/// elenco squadre selezionate
/// </summary>
public List<ListItem> selected;
protected void Page_Load(object sender, EventArgs e)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.