Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix errori compilazione ADM IO LAND

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-03-03 12:41:31 +01:00
parent 0667ec7f06
commit a8e8b97acb
8 changed files with 87 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-ADM/MP-ADM.csproj
+1
View File
@@ -511,6 +511,7 @@
<Content Include="FileUpload\.placeHolder.file">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include=".editorconfig" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.slim.js" />
MP-ADM/WebUserControls/cmp_planApprove.ascx.cs
-9
View File
@@ -9,15 +9,6 @@ namespace MP_ADM.WebUserControls
{
public partial class cmp_planApprove : BaseUserControl
{
#region Private Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
private DataLayer DataLayerObj = new DataLayer();
#endregion Private Fields
#region Protected Properties
/// <summary>
MP-ADM/WebUserControls/mod_anagArticoli.ascx.cs
+3 -51
View File
@@ -8,31 +8,12 @@ namespace MP_ADM.WebUserControls
{
public partial class mod_anagArticoli : BaseUserControl
{
#region Private Fields
/// <summary>
/// Oggetto datalayer specifico
/// </summary>
private DataLayer DataLayerObj = new DataLayer();
#endregion Private Fields
#region Protected Fields
protected string _idxGridView;
#endregion Protected Fields
#region Public Events
public event EventHandler eh_nuovoValore;
public event EventHandler eh_resetSelezione;
public event EventHandler eh_selValore;
#endregion Public Events
#region Private Methods
/// <summary>
@@ -125,10 +106,7 @@ namespace MP_ADM.WebUserControls
// salvo in session il valore selezionato...
memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false);
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
eh_selValore(this, new EventArgs());
}
raiseSelNew();
}
/// <summary>
@@ -139,10 +117,7 @@ namespace MP_ADM.WebUserControls
protected void ods_Updated(object sender, ObjectDataSourceStatusEventArgs e)
{
// evento come nuovo...
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
raiseNewVal();
}
protected void ods_Updating(object sender, ObjectDataSourceMethodEventArgs e)
@@ -266,30 +241,7 @@ namespace MP_ADM.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
lblWarning.Visible = false;
if (eh_resetSelezione != null)
{
eh_resetSelezione(this, new EventArgs());
}
}
/// <summary>
/// effettua traduzione del lemma
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduci(string lemma)
{
return user_std.UtSn.Traduci(lemma);
}
/// <summary>
/// effettua traduzione in inglese del lemma
/// </summary>
/// <param name="lemma"></param>
/// <returns></returns>
public string traduciEn(string lemma)
{
return user_std.UtSn.TraduciEn(lemma);
raiseReset();
}
#endregion Public Methods
MP-ADM/WebUserControls/mod_newOdl.ascx.cs
+70 -71
View File
@@ -5,15 +5,30 @@ namespace MP_ADM.WebUserControls
{
public partial class mod_newOdl : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
#region Private Methods
/// <summary>
/// mostro elenco ultimi 5 tempi e note...
/// </summary>
private void showLastTimeAndNote()
{
// update tempi ciclo!
grViewTempi.DataBind();
}
#region gestione eventi
#endregion Private Methods
public event EventHandler eh_nuovoValore;
#region Protected Methods
#endregion gestione eventi
/// <summary>
/// annullamento inserimento
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnCancel_Click(object sender, EventArgs e)
{
raiseNewVal();
}
/// <summary>
/// conferma inserimento TC
@@ -48,24 +63,63 @@ namespace MP_ADM.WebUserControls
{
logger.lg.scriviLog(string.Format("Non sono riuscito ad inserire l'ODL con i seguenti parametri: {0} | {1} | {2} | {3} | {4}", CodArticolo, IdxMacchina, numPezzi, TCiclo, pzPallet), tipoLog.ERROR);
}
// segnalo update
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
raiseNewVal();
}
/// <summary>
/// annullamento inserimento
/// reset della selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnCancel_Click(object sender, EventArgs e)
protected void btnReset_Click(object sender, EventArgs e)
{
if (eh_nuovoValore != null)
resetSelezione();
}
/// <summary>
/// selezione articolo
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlArticolo_SelectedIndexChanged(object sender, EventArgs e)
{
showLastTimeAndNote();
}
/// <summary>
/// selezione impianto
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlMacchine_SelectedIndexChanged(object sender, EventArgs e)
{
showLastTimeAndNote();
}
/// <summary>
/// evento selezione riga: salvo tempo e qta nei campi input...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grViewTempi_SelectedIndexChanged(object sender, EventArgs e)
{
// ricavo i dati selezionati
int idxOdl = 0;
try
{
eh_nuovoValore(this, new EventArgs());
idxOdl = Convert.ToInt32(grViewTempi.SelectedValue);
}
catch
{ }
MapoDb.DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxOdl, false)[0];
// precompilo dati pezzi/tempi
txtPezzi.Text = rigaOdl.NumPezzi.ToString();
txtTempoCiclo.Text = rigaOdl.TCAssegnato.ToString("0.00");
txtPzPallet.Text = rigaOdl.PzPallet.ToString();
}
protected void Page_Load(object sender, EventArgs e)
{
}
/// <summary>
@@ -91,44 +145,9 @@ namespace MP_ADM.WebUserControls
lblMinSec.Text = text;
}
/// <summary>
/// selezione articolo
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlArticolo_SelectedIndexChanged(object sender, EventArgs e)
{
showLastTimeAndNote();
}
#endregion Protected Methods
/// <summary>
/// mostro elenco ultimi 5 tempi e note...
/// </summary>
private void showLastTimeAndNote()
{
// update tempi ciclo!
grViewTempi.DataBind();
}
/// <summary>
/// selezione impianto
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void ddlMacchine_SelectedIndexChanged(object sender, EventArgs e)
{
showLastTimeAndNote();
}
/// <summary>
/// reset della selezione
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnReset_Click(object sender, EventArgs e)
{
resetSelezione();
}
#region Public Methods
/// <summary>
/// resetta la selezione dei valori in caso di modifiche su altri controlli
@@ -139,26 +158,6 @@ namespace MP_ADM.WebUserControls
grViewTempi.DataBind();
}
/// <summary>
/// evento selezione riga: salvo tempo e qta nei campi input...
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void grViewTempi_SelectedIndexChanged(object sender, EventArgs e)
{
// ricavo i dati selezionati
int idxOdl = 0;
try
{
idxOdl = Convert.ToInt32(grViewTempi.SelectedValue);
}
catch
{ }
MapoDb.DS_ProdTempi.ODLRow rigaOdl = DataLayerObj.taODL.getByIdx(idxOdl, false)[0];
// precompilo dati pezzi/tempi
txtPezzi.Text = rigaOdl.NumPezzi.ToString();
txtTempoCiclo.Text = rigaOdl.TCAssegnato.ToString("0.00");
txtPzPallet.Text = rigaOdl.PzPallet.ToString();
}
#endregion Public Methods
}
}
MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs
+2 -14
View File
@@ -7,12 +7,6 @@ namespace MP_ADM.WebUserControls
{
public partial class mod_newPromessaODL : BaseUserControl
{
#region Public Events
public event EventHandler eh_nuovoValore;
#endregion Public Events
#region Public Properties
/// <summary>
@@ -83,10 +77,7 @@ namespace MP_ADM.WebUserControls
{
memLayer.ML.emptySessionVal("idxProm2Clone");
memLayer.ML.emptySessionVal("idxProm2Edit");
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
raiseNewVal();
}
/// <summary>
@@ -158,10 +149,7 @@ namespace MP_ADM.WebUserControls
memLayer.ML.emptySessionVal("idxProm2Edit");
}
// segnalo update
if (eh_nuovoValore != null)
{
eh_nuovoValore(this, new EventArgs());
}
raiseNewVal();
}
/// <summary>
MP-IO/MP-IO.csproj
+1
View File
@@ -365,6 +365,7 @@
</Content>
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<Content Include=".editorconfig" />
<None Include="NLog.xsd">
<SubType>Designer</SubType>
</None>
MP-LAND/Controllers/HomeController.cs
+9 -3
View File
@@ -37,7 +37,9 @@ namespace MP.Controllers
}
}
catch (Exception exc)
{ }
{
SteamWare.Logger.Logging.Instance.Error($"Exception on getAKV:{Environment.NewLine}{exc}");
}
}
return answ;
}
@@ -72,8 +74,10 @@ namespace MP.Controllers
string currTgt = getAKV(key);
answ = $"{currUrl.Scheme}://{currUrl.Authority}/{currTgt}";
}
catch
{ }
catch (Exception exc)
{
SteamWare.Logger.Logging.Instance.Error($"Exception on urlTgt:{Environment.NewLine}{exc}");
}
return answ;
}
@@ -350,6 +354,7 @@ namespace MP.Controllers
}
catch (Exception exc)
{
SteamWare.Logger.Logging.Instance.Error($"Exception on check auth CTRACK:{Environment.NewLine}{exc}");
ViewBag.CTrack_Enb = false;
}
// fix visibilità MAG
@@ -371,6 +376,7 @@ namespace MP.Controllers
}
catch (Exception exc)
{
SteamWare.Logger.Logging.Instance.Error($"Exception on check auth MAG:{Environment.NewLine}{exc}");
ViewBag.MAG_Enb = false;
}
}
MP-LAND/MP-LAND.csproj
+1
View File
@@ -372,6 +372,7 @@
<Content Include="fonts\RobotoCondensed.woff2" />
<Content Include="fonts\OpenSansCondensed.woff" />
<Content Include="fonts\OpenSans.woff" />
<Content Include=".editorconfig" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<None Include="Scripts\jquery-3.5.1-vsdoc.js" />
<Content Include="Scripts\jquery-3.5.1.js" />