diff --git a/Db/GIM.zip b/Db/GIM.zip index e76383a..e8bc438 100644 Binary files a/Db/GIM.zip and b/Db/GIM.zip differ diff --git a/WebSites/WebGIM/Style.css b/WebSites/WebGIM/Style.css index ace5879..e811ecd 100644 --- a/WebSites/WebGIM/Style.css +++ b/WebSites/WebGIM/Style.css @@ -6,6 +6,12 @@ text-align:center; color:Black; } +.textEv_1 +{ + background-color:#cdffcd; + text-align:center; + color:Black; +} /* @group Calendario */ diff --git a/WebSites/WebGIM/Web.config b/WebSites/WebGIM/Web.config index d2814dd..8dd386c 100644 --- a/WebSites/WebGIM/Web.config +++ b/WebSites/WebGIM/Web.config @@ -102,6 +102,7 @@ + diff --git a/WebSites/WebGIM/insertRichiesta.aspx b/WebSites/WebGIM/insertRichiesta.aspx index 190fd2e..5f2b33b 100644 --- a/WebSites/WebGIM/insertRichiesta.aspx +++ b/WebSites/WebGIM/insertRichiesta.aspx @@ -1,8 +1,11 @@ -<%@ Page Title="" Language="C#" MasterPageFile="~/AjaxSearch.master" AutoEventWireup="true" CodeFile="insertRichiesta.aspx.cs" Inherits="insertRichiesta" %> +<%@ Page Title="" Language="C#" MasterPageFile="~/Ajax.master" AutoEventWireup="true" CodeFile="insertRichiesta.aspx.cs" Inherits="insertRichiesta" %> <%@ Register src="mod_insertRichiesta.ascx" tagname="mod_insertRichiesta" tagprefix="uc1" %> +<%@ Register src="mod_fixCal.ascx" tagname="mod_fixCal" tagprefix="uc2" %> + + diff --git a/WebSites/WebGIM/mod_insertRichiesta.ascx b/WebSites/WebGIM/mod_insertRichiesta.ascx index 0b2e3b9..fdce1e7 100644 --- a/WebSites/WebGIM/mod_insertRichiesta.ascx +++ b/WebSites/WebGIM/mod_insertRichiesta.ascx @@ -1,5 +1,6 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeFile="mod_insertRichiesta.ascx.cs" Inherits="mod_insertRichiesta" %> +<%@ Register Assembly="AjaxControlToolkit" Namespace="AjaxControlToolkit" TagPrefix="cc1" %>
@@ -34,6 +35,8 @@ SelectMethod="getImpiantiValidi" TypeName="DS_utilityTableAdapters.v_selImpiantiTableAdapter"> +
@@ -50,40 +53,74 @@ +

-
+
+

- +

- + + +
-
- +
+
- +
+ + +
- +
+ + +
+
+
+
-
- sel +
+
+
+ + + +
-
- sel +
+
+ + + +
-
- sel +
+ +
+
+
@@ -91,15 +128,20 @@
- +
- - + + + + +
diff --git a/WebSites/WebGIM/mod_insertRichiesta.ascx.cs b/WebSites/WebGIM/mod_insertRichiesta.ascx.cs index 829e8c3..09199f5 100644 --- a/WebSites/WebGIM/mod_insertRichiesta.ascx.cs +++ b/WebSites/WebGIM/mod_insertRichiesta.ascx.cs @@ -29,23 +29,43 @@ public partial class mod_insertRichiesta : System.Web.UI.UserControl /// protected void Page_Load(object sender, EventArgs e) { - traduciObj(); - setFixedVal(); - fixVisibilitàPnl(); + if (!Page.IsPostBack) + { + traduciObj(); + setFixedVal(); + fixVisibilitàPnl(); + } } /// /// imposta i valori calcolati e fissi... /// private void setFixedVal() { + // recupero valori di riferimento int shift = memLayer.ML.confReadint("shiftTurno"); int durataTurno = memLayer.ML.confReadint("durataTurno"); int turno = Convert.ToInt32(Math.Ceiling((double)Convert.ToDouble(DateTime.Now.AddHours(-shift).Hour) / durataTurno)); + int delay = memLayer.ML.confReadint("defaultDelay"); + // inserisco valori di default + txtMatr.Text = "0000"; txtDataOra.Text = string.Format("{0:ddd dd/MM/yyyy HH:mm}", DateTime.Now); txtDataLav.Text = string.Format("{0:dd/MM/yyyy}", DateTime.Now.AddHours(-6)); txtTurnoLav.Text = turno.ToString(); txtFermaDaData.Text = string.Format("{0:dd/MM/yy}", DateTime.Now); - txtFermaDaOra.Text = string.Format("{0:HH:mm}", DateTime.Now.AddMinutes(-10)); + // aggiongo valori ora e minuti... + ddlFermaDaOra.Items.Clear(); + ddlFermaDaMin.Items.Clear(); + for (int i = 0; i < 24; i++) + { + ddlFermaDaOra.Items.Add(new ListItem(string.Format("{0:00}", i), i.ToString())); + } + for (int i = 0; i < 60; i++) + { + ddlFermaDaMin.Items.Add(new ListItem(string.Format("{0:00}", i), i.ToString())); + } + ddlFermaDaOra.SelectedValue = DateTime.Now.AddMinutes(-delay).Hour.ToString(); + ddlFermaDaMin.SelectedValue = DateTime.Now.AddMinutes(-delay).Minute.ToString(); + chkImpFermo.Checked = true; } /// /// sistema la visibilità dei controlli @@ -79,11 +99,24 @@ public partial class mod_insertRichiesta : System.Web.UI.UserControl lblDettagliGuasto.Text = traduci("lblDettagliGuasto"); lblMatr.Text = traduci("lblMatr"); lblPrior.Text = traduci("lblPrior"); - lblFermaDalle.Text = traduci("lblFermaDalle"); + lblFermaDalleData.Text = traduci("lblFermaDalleData"); + lblFermaDalleOra.Text = traduci("lblFermaDalleOra"); + lblFermaDalleMin.Text = traduci("lblFermaDalleMin"); + lblAmbito.Text = traduci("lblAmbito"); + lblTipoGuasto.Text = traduci("lblTipoGuasto"); + chkImpFermo.Text = traduci("chkImpFermo"); + // setup stringhe validazione + valSummary.HeaderText = traduci("errori"); + rfvReparto.ErrorMessage = string.Format("{0}: {1}", traduci("campoRichiesto"),traduci("reparto")); + rfvMacchina.ErrorMessage = string.Format("{0}: {1}", traduci("campoRichiesto"), traduci("macchina")); } protected void listImpianti_SelectedIndexChanged(object sender, EventArgs e) { // aggiorno altro selettore... listMacchine.DataBind(); } + protected void btnSend_Click(object sender, EventArgs e) + { + + } } diff --git a/WebSites/WebGIM/sql/GIM_0000.sql b/WebSites/WebGIM/sql/GIM_0000.sql index b53accd..154e8b7 100644 --- a/WebSites/WebGIM/sql/GIM_0000.sql +++ b/WebSites/WebGIM/sql/GIM_0000.sql @@ -34,6 +34,39 @@ BEGIN END GO +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Causali2FamMacchine' AND TABLE_SCHEMA = 'dbo') +BEGIN + DROP TABLE Causali2FamMacchine +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagTipoGuasto' AND TABLE_SCHEMA = 'dbo') +BEGIN + DROP TABLE AnagTipoGuasto +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagCausali' AND TABLE_SCHEMA = 'dbo') +BEGIN + ALTER TABLE Causali2FamMacchine DROP CONSTRAINT FK_Causali2FamMacchine_AnagCausali + DROP TABLE AnagCausali +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagFamMacchine' AND TABLE_SCHEMA = 'dbo') +BEGIN + ALTER TABLE Causali2FamMacchine DROP CONSTRAINT FK_Causali2FamMacchine_AnagFamMacchine + ALTER TABLE Macchine2FamMacchine DROP CONSTRAINT FK_Macchine2FamMacchine_AnagFamMacchine + DROP TABLE AnagFamMacchine +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Macchine2FamMacchine' AND TABLE_SCHEMA = 'dbo') +BEGIN + DROP TABLE Macchine2FamMacchine +END +GO + IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagMacchine' AND TABLE_SCHEMA = 'dbo') BEGIN DROP TABLE dbo.AnagMacchine @@ -52,6 +85,26 @@ BEGIN END GO +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagEventi' AND TABLE_SCHEMA = 'dbo') +BEGIN + ALTER TABLE Tra_Ev2Stati DROP CONSTRAINT FK_Tra_Ev2Stati_AnagEventi + DROP TABLE dbo.AnagEventi +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'AnagStati' AND TABLE_SCHEMA = 'dbo') +BEGIN + ALTER TABLE Tra_Ev2Stati DROP CONSTRAINT FK_Tra_Ev2Stati_AnagStati + DROP TABLE dbo.AnagStati +END +GO + +IF EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'Tra_Ev2Stati' AND TABLE_SCHEMA = 'dbo') +BEGIN + DROP TABLE Tra_Ev2Stati +END +GO + /* elimino stored e funzioni */ @@ -64,4 +117,10 @@ DROP FUNCTION [dbo].[rightDivision] IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_clonaImpianto]') AND type in (N'P', N'PC')) DROP PROCEDURE [dbo].[sp_clonaImpianto] +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_clonaMacchina]') AND type in (N'P', N'PC')) +DROP PROCEDURE [dbo].[sp_clonaMacchina] + +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[sp_spostaMacchina]') AND type in (N'P', N'PC')) +DROP PROCEDURE [dbo].[sp_spostaMacchina] + GO diff --git a/WebSites/WebGIM/sql/GIM_0001.sql b/WebSites/WebGIM/sql/GIM_0001.sql index 72c6128..1cdc4a6 100644 --- a/WebSites/WebGIM/sql/GIM_0001.sql +++ b/WebSites/WebGIM/sql/GIM_0001.sql @@ -175,24 +175,119 @@ CREATE TABLE AnagPriorita( ) GO -/****** Object: StoredProcedure [dbo].[sp_clonaImpianto] Script Date: 01/14/2009 17:30:04 ******/ +SET xact_abort ON +GO + +BEGIN TRANSACTION +GO + +CREATE TABLE AnagEventi( + idxEvento INT NOT NULL CONSTRAINT PK_AnagEventi PRIMARY KEY, + DescrEvento NVARCHAR(50) +) +GO + +CREATE TABLE AnagStati( + idxStato INT NOT NULL CONSTRAINT PK_AnagStati PRIMARY KEY, + DescrStato NVARCHAR(50) +) +GO + +CREATE TABLE Tra_Ev2Stati( + idxStato INT NOT NULL, + idxEvento INT NOT NULL, + nextIdxStato INT NOT NULL, + valReady BIT, + valValidAX BIT, + incrRevAx INT, + + CONSTRAINT PK_Tra_Ev2Stati PRIMARY KEY(idxStato,idxEvento) +) +GO + +ALTER TABLE Tra_Ev2Stati ADD + CONSTRAINT FK_Tra_Ev2Stati_AnagStati FOREIGN KEY(idxStato) REFERENCES AnagStati(idxStato) ON UPDATE CASCADE, + CONSTRAINT FK_Tra_Ev2Stati_AnagEventi FOREIGN KEY(idxEvento) REFERENCES AnagEventi(idxEvento) ON UPDATE CASCADE +GO + +COMMIT +GO + + +SET xact_abort ON +GO + +BEGIN TRANSACTION +GO + +CREATE TABLE AnagCausali( + idxCausale INT NOT NULL IDENTITY CONSTRAINT PK_AnagCausali PRIMARY KEY, + descrCausale NVARCHAR(50) +) +GO + +CREATE TABLE AnagFamMacchine( + idxFamMacchine INT NOT NULL IDENTITY CONSTRAINT PK_AnagFamMacchine PRIMARY KEY, + nomeFamMacch NVARCHAR(50) +) +GO + +CREATE TABLE Causali2FamMacchine( + idxCausale INT NOT NULL, + idxFamMacchine INT NOT NULL, + + CONSTRAINT PK_Causali2FamMacchine PRIMARY KEY(idxCausale,idxFamMacchine) +) +GO + +ALTER TABLE Causali2FamMacchine ADD + CONSTRAINT FK_Causali2FamMacchine_AnagCausali FOREIGN KEY(idxCausale) REFERENCES AnagCausali(idxCausale) ON UPDATE CASCADE, + CONSTRAINT FK_Causali2FamMacchine_AnagFamMacchine FOREIGN KEY(idxFamMacchine) REFERENCES AnagFamMacchine(idxFamMacchine) ON UPDATE CASCADE +GO + +CREATE TABLE Macchine2FamMacchine( + idxMacchina INT NOT NULL, + idxFamMacchine INT NOT NULL, + + CONSTRAINT PK_Macchine2FamMacchine PRIMARY KEY(idxMacchina,idxFamMacchine) +) +GO + +ALTER TABLE Macchine2FamMacchine ADD + CONSTRAINT FK_Macchine2FamMacchine_AnagMacchine FOREIGN KEY(idxMacchina) REFERENCES AnagMacchine(idxMacchina) ON UPDATE CASCADE, + CONSTRAINT FK_Macchine2FamMacchine_AnagFamMacchine FOREIGN KEY(idxFamMacchine) REFERENCES AnagFamMacchine(idxFamMacchine) ON UPDATE CASCADE +GO + +COMMIT +GO + +CREATE TABLE AnagTipoGuasto( + idxTipo INT NOT NULL IDENTITY CONSTRAINT PK_AnagTipoGuasto PRIMARY KEY, + descrTipo NVARCHAR(50) +) +GO + + + +BEGIN TRANSACTION +GO + SET ANSI_NULLS ON GO -SET QUOTED_IDENTIFIER ON -GO + /************************************* * STORED PROCEDURE sp_clonaImpianto * Clona i dati dell'impianto indicato * * modif.: S.E.L. - 2009.01.14 **************************************/ -CREATE PROCEDURE [dbo].[sp_clonaImpianto] +CREATE PROCEDURE sp_clonaImpianto ( - @idxImpianto int + @idxImpianto INT ) AS -BEGIN tran +BEGIN TRAN INSERT INTO AnagImpianti (codImpianto, nomeImpianto, tipoImpianto, funzDal, funzAl) @@ -200,11 +295,130 @@ BEGIN tran FROM AnagImpianti AS AnagImpianti_1 WHERE (idxImpianto = @idxImpianto) -COMMIT tran +COMMIT TRAN RETURN GO +/************************************* +* STORED PROCEDURE sp_clonaMacchina +* Clona i dati della macchina indicata +* +* modif.: S.E.L. - 2009.01.14 +**************************************/ +CREATE PROCEDURE sp_clonaMacchina +( + @idxMacchina INT +) +AS + +BEGIN TRAN + + INSERT INTO AnagMacchine + (idxImpianto, codMacchina, nomeMacchina, modello, anno, kgPeso, kwConsumo, funzDal, funzAl) + SELECT idxImpianto, codMacchina + '-clone' AS Expr1, nomeMacchina + '-clone' AS Expr2, modello, anno, kgPeso, kwConsumo, funzDal, funzAl + FROM AnagMacchine AS AnagMacchine_1 + WHERE (idxMacchina = @idxMacchina) + +COMMIT TRAN + +RETURN +GO + +/************************************* +* STORED PROCEDURE sp_spostaMacchina +* Sposta la macchina all'impianto indicato +* +* modif.: S.E.L. - 2009.01.14 +**************************************/ +CREATE PROCEDURE sp_spostaMacchina +( + @idxMacchina INT, + @idxImpiantoTo INT +) +AS + +UPDATE AnagMacchine +SET idxImpianto = @idxImpiantoTo +WHERE (idxMacchina = @idxMacchina) + +RETURN +GO + +COMMIT +GO + + +BEGIN TRANSACTION +GO + +SET ANSI_NULLS ON +GO + +CREATE VIEW v_macchine +AS +SELECT dbo.AnagMacchine.idxMacchina, dbo.AnagMacchine.idxImpianto, dbo.AnagMacchine.codMacchina, dbo.AnagMacchine.nomeMacchina, dbo.AnagMacchine.modello, + dbo.AnagMacchine.matricola, dbo.AnagMacchine.anno, dbo.AnagMacchine.kgPeso, dbo.AnagMacchine.kwConsumo, dbo.AnagMacchine.funzDal, + dbo.AnagMacchine.funzAl, dbo.AnagImpianti.codImpianto + ' - ' + dbo.AnagImpianti.nomeImpianto AS descrImpianto +FROM dbo.AnagMacchine INNER JOIN + dbo.AnagImpianti ON dbo.AnagMacchine.idxImpianto = dbo.AnagImpianti.idxImpianto +GO + +CREATE VIEW v_selAmbiti +AS +SELECT TOP (100) PERCENT idxAmbito AS value, descrAmbitoGuasto AS label +FROM dbo.AnagAmbitoGuasto +ORDER BY label +GO + +CREATE VIEW v_selCausaliMacchine +AS +SELECT dbo.AnagCausali.idxCausale AS value, dbo.AnagCausali.descrCausale AS label, dbo.Macchine2FamMacchine.idxMacchina AS conditio +FROM dbo.Causali2FamMacchine INNER JOIN + dbo.Macchine2FamMacchine ON dbo.Causali2FamMacchine.idxFamMacchine = dbo.Macchine2FamMacchine.idxFamMacchine INNER JOIN + dbo.AnagCausali ON dbo.Causali2FamMacchine.idxCausale = dbo.AnagCausali.idxCausale +GO + +CREATE VIEW v_selFamMacc +AS +SELECT dbo.Macchine2FamMacchine.idxFamMacchine, dbo.AnagMacchine.idxMacchina, dbo.AnagFamMacchine.nomeFamMacch AS famiglia, + ISNULL(dbo.AnagMacchine.codMacchina, 'n.d.') + ' - ' + dbo.AnagMacchine.nomeMacchina + ', mod. ' + ISNULL(dbo.AnagMacchine.modello, 'n.d.') + + ' (' + ISNULL(dbo.AnagMacchine.matricola, 'n.d.') + ')' AS macchina +FROM dbo.Macchine2FamMacchine INNER JOIN + dbo.AnagFamMacchine ON dbo.Macchine2FamMacchine.idxFamMacchine = dbo.AnagFamMacchine.idxFamMacchine INNER JOIN + dbo.AnagMacchine ON dbo.Macchine2FamMacchine.idxMacchina = dbo.AnagMacchine.idxMacchina +GO + +CREATE VIEW v_selImpianti +AS +SELECT TOP (100) PERCENT idxImpianto AS value, ISNULL(codImpianto, 'n.d.') + ' - ' + nomeImpianto + ' (' + ISNULL(tipoImpianto, 'n.d.') + ')' AS label +FROM dbo.AnagImpianti +ORDER BY label +GO + + +CREATE VIEW v_selMacchine +AS +SELECT TOP (100) PERCENT idxMacchina AS value, ISNULL(codMacchina, 'n.d.') + ' - ' + nomeMacchina + ', mod. ' + ISNULL(modello, 'n.d.') + ' (' + ISNULL(matricola, 'n.d.') + + ')' AS label, idxImpianto AS conditio +FROM dbo.AnagMacchine +ORDER BY label +GO + + +CREATE VIEW v_selPrior +AS +SELECT TOP (100) PERCENT idxPriorita AS value, CAST(idxPriorita AS VARCHAR(4)) + ' - ' + descrPriorita AS label +FROM dbo.AnagPriorita +ORDER BY label +GO + +COMMIT +GO + + + + /*registro versione...*/ INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(1, GETDATE()) GO