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

completati update x registro controlli + SQL...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-13 18:30:57 +01:00
parent f087e70d71
commit 17896ecf01
6 changed files with 170 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=703']) {
withEnv(['NEXT_BUILD_NUMBER=704']) {
// env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '5.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Tablet/Controlli.aspx.cs
+11
View File
@@ -11,7 +11,18 @@ namespace MoonProTablet
{
protected void Page_Load(object sender, EventArgs e)
{
mod_controlliProd.eh_newVal += Mod_controlliProd_eh_newVal;
mod_controlliProd.eh_reset += Mod_controlliProd_eh_reset;
}
private void Mod_controlliProd_eh_reset(object sender, EventArgs e)
{
mod_elencoControlli.doUpdate();
}
private void Mod_controlliProd_eh_newVal(object sender, EventArgs e)
{
mod_elencoControlli.doUpdate();
}
}
}
MP-Tablet/WebUserControls/mod_controlliProd.ascx.cs
+12 -5
View File
@@ -11,10 +11,6 @@ namespace MoonProTablet.WebUserControls
{
public partial class mod_controlliProd : System.Web.UI.UserControl
{
/// <summary>
/// registrato nuovo valore
/// </summary>
public event EventHandler eh_inserting;
/// <summary>
/// registrato nuovo valore
/// </summary>
@@ -185,14 +181,24 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void lbtSalva_Click(object sender, EventArgs e)
{
// salvo controllo KO !!!FARE!!!
// salvo controllo KO
DataLayer.obj.taRC.insertQuery(idxMacchina, DataLayer.MatrOpr, false, txtNoteContr.Text.Trim(), DateTime.Now);
// sollevo evento!
if (eh_newVal != null)
{
eh_newVal(this, new EventArgs());
}
resetControlli();
}
private void resetControlli()
{
txtNoteContr.Text = "";
// nascondo!
switchBtnConferma(false);
divNote.Visible = false;
}
protected void ddlSubMacc_SelectedIndexChanged(object sender, EventArgs e)
{
subMaccSel = ddlSubMacc.SelectedValue;
@@ -237,6 +243,7 @@ namespace MoonProTablet.WebUserControls
{
eh_newVal(this, new EventArgs());
}
resetControlli();
}
protected void lbtKO_Click(object sender, EventArgs e)
MP-Tablet/WebUserControls/mod_elencoControlli.ascx
+27 -60
View File
@@ -1,69 +1,36 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_elencoControlli.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_elencoControlli" %>
<%@ Register Src="~/WebUserControls/mod_selPeriodo.ascx" TagPrefix="uc1" TagName="mod_selPeriodo" %>
<%--<script>
// Gestione oggetti datepicker (globale)
function fixDatePicker() {
try {
if (!Modernizr.inputtypes.date) {
// If not native HTML5 support, fallback to jQuery datePicker
$('input[type=date]').datepicker({
// Consistent format with the HTML5 picker
dateFormat: 'yy-mm-dd'
}
//// Localization
//,$.datepicker.regional['it']
);
}
}
catch (err) { }
}
// richiamo quando il DOM della pagina è ok...
$(function () {
fixDatePicker();
});
// oggetto da legare all'update parziale ajax x sistemare script vari
var prm = Sys.WebForms.PageRequestManager.getInstance();
prm.add_endRequest(function () {
// re-bind your jQuery events here
$(function () {
fixDatePicker();
});
});
</script>--%>
<%--<div class="row small py-0 my-0">
<div class="col-6 pr-1">
<div class="form-group">
<label for="txtDataFrom">dal</label>
<asp:TextBox runat="server" ID="txtDataFrom" class="datepicker form-control" TextMode="Date"></asp:TextBox>
</div>
</div>
<div class="col-6 pl-1">
<div class="form-group">
<label for="txtDataTo">al</label>
<asp:TextBox runat="server" ID="txtDataTo" class="datepicker form-control" TextMode="Date"></asp:TextBox>
</div>
</div>
</div>--%>
<div class="row small">
<div class="col-12">
<uc1:mod_selPeriodo runat="server" id="mod_selPeriodo" />
<asp:GridView ID="grView" runat="server" CssClass="table table-condensed table-striped table-responsive" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxControllo">
<uc1:mod_selPeriodo runat="server" ID="mod_selPeriodo" />
<asp:GridView ID="grView" runat="server" CssClass="table table-sm table-striped table-responsive" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="IdxControllo" AllowSorting="true">
<Columns>
<asp:BoundField DataField="IdxControllo" HeaderText="IdxControllo" InsertVisible="False" ReadOnly="True" SortExpression="IdxControllo" />
<asp:BoundField DataField="DataOra" HeaderText="DataOra" SortExpression="DataOra" />
<asp:BoundField DataField="IdxMacchina" HeaderText="IdxMacchina" SortExpression="IdxMacchina" />
<asp:BoundField DataField="IdxODL" HeaderText="IdxODL" SortExpression="IdxODL" />
<asp:BoundField DataField="CodArticolo" HeaderText="CodArticolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="MatrOpr" HeaderText="MatrOpr" SortExpression="MatrOpr" />
<asp:CheckBoxField DataField="EsitoOK" HeaderText="EsitoOK" SortExpression="EsitoOK" />
<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />
<asp:BoundField DataField="Operatore" HeaderText="Operatore" ReadOnly="True" SortExpression="Operatore" />
<asp:TemplateField HeaderText="Data-Ora controllo" SortExpression="DataOra">
<ItemTemplate>
<div class="row">
<div class="col-5">
<asp:Label ID="Label1" runat="server" Text='<%# Eval("DataOra") %>' />
</div>
<div class="col-2 px-0 text-center">
<i runat="server" class="fa fa-check-circle fa-3x text-success" aria-hidden="true" visible='<%# Convert.ToBoolean(Eval("EsitoOK")) %>'></i>
<i runat="server" class="fa fa-ban fa-3x text-danger" aria-hidden="true" visible='<%# !Convert.ToBoolean(Eval("EsitoOK")) %>'></i>
</div>
<div class="col-5 text-right text-secondary">
<asp:Label ID="Label3" runat="server" Text='<%# Eval("Operatore") %>' /> <i class="fa fa-user fa-2x" aria-hidden="true"></i>
</div>
<div class="col-6">
ODL: <asp:Label ID="Label4" runat="server" Text='<%# Eval("IdxODL") %>' />
</div>
<div class="col-6 text-right">
Art: <asp:Label ID="Label5" runat="server" Text='<%# Eval("CodArticolo") %>' />
</div>
<div class="col-12 small text-warning">
<i><asp:Label ID="Label6" runat="server" Text='<%# Eval("Note") %>' Visible='<%# Eval("Note").ToString()!="" %>' /></i>
</div>
</div>
</ItemTemplate>
</asp:TemplateField>
</Columns>
</asp:GridView>
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getFilt" TypeName="MapoDb.DS_ProdTempiTableAdapters.RegistroControlliTableAdapter">
MP-Tablet/WebUserControls/mod_elencoControlli.ascx.cs
+5 -8
View File
@@ -12,14 +12,11 @@ namespace MoonProTablet.WebUserControls
{
protected void Page_Load(object sender, EventArgs e)
{
#if false
if (!Page.IsPostBack)
{
intervalloDate periodo = datario.mngr.ultimiMesi(DateTime.Now, 12);
txtDataFrom.Text = periodo.inizio.ToShortDateString();
txtDataTo.Text = periodo.fine.ToShortDateString();
}
#endif
}
public void doUpdate()
{
grView.DataBind();
}
}
}
SQL Utils/SqlUpdate_5.0.sql
+114
View File
@@ -12,3 +12,117 @@ UPDATE LinkMenuJQM
WHERE Testo = 'Fermate'
GO
/* TAB Registro controlli */
/****** Object: Table [dbo].[RegistroControlli] Script Date: 13/03/2018 18:30:04 ******/
SET ANSI_NULLS ON
GO
SET QUOTED_IDENTIFIER ON
GO
CREATE TABLE [dbo].[RegistroControlli](
[IdxControllo] [int] IDENTITY(1,1) NOT NULL,
[DataOra] [datetime] NOT NULL,
[IdxMacchina] [nvarchar](50) NOT NULL,
[IdxODL] [int] NOT NULL,
[CodArticolo] [nvarchar](50) NOT NULL,
[MatrOpr] [int] NOT NULL,
[EsitoOK] [bit] NOT NULL,
[Note] [nvarchar](250) NOT NULL,
CONSTRAINT [PK_RegistroControlli] PRIMARY KEY CLUSTERED
(
[IdxControllo] ASC
)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY]
) ON [PRIMARY]
GO
ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_CodArticolo] DEFAULT ('-') FOR [CodArticolo]
GO
ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_EsitoOK] DEFAULT ((0)) FOR [EsitoOK]
GO
ALTER TABLE [dbo].[RegistroControlli] ADD CONSTRAINT [DF_RegistroControlli_Note] DEFAULT ('') FOR [Note]
GO
EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'matricola dell''approvatore del record' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RegistroControlli', @level2type=N'COLUMN',@level2name=N'MatrOpr'
GO
/*************************************
* STORED PROCEDURE stp_RC_getByFilt
*
* modif.: Steamware
* modif: 2018.03.12 recupero elenco controlli filtrato
**************************************/
CREATE PROCEDURE [dbo].[stp_RC_getByFilt]
(
@IdxMacchina NVARCHAR(50) = 0,
@DataFrom DATETIME = NULL,
@DataTo DATETIME = NULL
)
AS
BEGIN
SET NOCOUNT ON;
SET XACT_ABORT ON;
IF @DataFrom IS NULL SET @DataFrom = DATEADD(YEAR, -1,GETDATE())
IF @DataTo IS NULL SET @DataTo = GETDATE()
-- recupero da tab ODL il codice odl stesso e l'articolo data macchina e data/ora...
SELECT *
FROM v_RegistroControlli
WHERE IdxMacchina = CASE WHEN @IdxMacchina = 0 THEN IdxMacchina ELSE @IdxMacchina END
AND DataOra BETWEEN @DataFrom AND @DataTo
ORDER BY DataOra DESC
END
GO
/*************************************
* STORED PROCEDURE stp_RC_insert
*
* registra i controlli di produzione OK / KO (con note)
*
*
* modif.: Steamware
* modif: 2018.03.12 gestione x Jetco controlli
**************************************/
CREATE PROCEDURE [dbo].[stp_RC_insert]
(
@IdxMacchina NVARCHAR(50),
@MatrOpr INT,
@EsitoOk BIT,
@Note NVARCHAR(50),
@DataOra DATETIME = NULL
)
AS
BEGIN
SET NOCOUNT ON;
SET XACT_ABORT ON;
IF @DataOra IS NULL SET @DataOra = GETDATE()
-- imposto valori accessori
DECLARE @IdxODL INT = 0
DECLARE @CodArticolo NVARCHAR(50) = 'ND'
-- recupero da tab ODL il codice odl stesso e l'articolo data macchina e data/ora...
SELECT @IdxODL = ISNULL(IdxODL,0), @CodArticolo = ISNULL(CodArticolo,'-')
FROM ODL
WHERE IdxMacchina = @IdxMacchina
AND DataInizio <= @DataOra
AND ISNULL(DataFine, GETDATE()) >= @DataOra
-- verifica parametri...
--SELECT @DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOk, @Note
-- insert valori!
INSERT INTO RegistroControlli (DataOra,IdxMacchina,IdxODL,CodArticolo,MatrOpr,EsitoOK,Note)
VALUES (@DataOra, @IdxMacchina, @IdxODL, @CodArticolo, @MatrOpr, @EsitoOk, @Note)
END
GO