diff --git a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll index cf14767..72ccf0e 100644 Binary files a/CMS-SC-Data/bin/Release/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Release/SteamWare.dll b/CMS-SC-Data/bin/Release/SteamWare.dll index 5804a7e..e3fbcc7 100644 Binary files a/CMS-SC-Data/bin/Release/SteamWare.dll and b/CMS-SC-Data/bin/Release/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll index cf14767..72ccf0e 100644 Binary files a/CMS-SC-Data/obj/Release/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Release/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Release/build.force b/CMS-SC-Data/obj/Release/build.force deleted file mode 100644 index e69de29..0000000 diff --git a/CMS_SC/AnagTags.aspx b/CMS_SC/AnagTags.aspx new file mode 100644 index 0000000..a123dba --- /dev/null +++ b/CMS_SC/AnagTags.aspx @@ -0,0 +1,22 @@ +<%@ Page Title="" Language="C#" MasterPageFile="~/Bootstrap.Master" AutoEventWireup="true" CodeBehind="AnagTags.aspx.cs" Inherits="CMS_SC.AnagTags" %> +<%@ Register src="~/WebUserControls/mod_anagTags.ascx" tagname="mod_anagTags" tagprefix="uc1" %> +<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc2" %> + + + + + +
+
+
+

<%: traduci("AnagFasi") %>

+
+
+ +
+
+ +
+
+
+ diff --git a/CMS_SC/AnagTags.aspx.cs b/CMS_SC/AnagTags.aspx.cs new file mode 100644 index 0000000..671498e --- /dev/null +++ b/CMS_SC/AnagTags.aspx.cs @@ -0,0 +1,38 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC +{ + public partial class AnagTags : System.Web.UI.Page + { + protected void Page_Load(object sender, EventArgs e) + { + + if (!Page.IsPostBack) + { + ((Bootstrap)this.Master).showSearch = true; + mod_righePag.numRowPag = 20; + mod_anagTags.pageSize = mod_righePag.numRowPag; + } + mod_righePag.eh_newNum += mod_righePag_eh_newNum; + } + /// + /// wrapper traduzione + /// + /// + /// + public string traduci(string lemma) + { + return user_std.UtSn.Traduci(lemma); + } + void mod_righePag_eh_newNum(object sender, EventArgs e) + { + mod_anagTags.pageSize = mod_righePag.numRowPag; + } + } +} \ No newline at end of file diff --git a/CMS_SC/AnagTags.aspx.designer.cs b/CMS_SC/AnagTags.aspx.designer.cs new file mode 100644 index 0000000..1f818d2 --- /dev/null +++ b/CMS_SC/AnagTags.aspx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC { + + + public partial class AnagTags { + + /// + /// mod_anagTags control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::CMS_SC.WebUserControls.mod_anagTags mod_anagTags; + + /// + /// mod_righePag control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::mod_righePag mod_righePag; + } +} diff --git a/CMS_SC/CMS_SC.csproj b/CMS_SC/CMS_SC.csproj index 0ac5fd1..b80b8f0 100644 --- a/CMS_SC/CMS_SC.csproj +++ b/CMS_SC/CMS_SC.csproj @@ -158,6 +158,7 @@ + @@ -331,6 +332,7 @@ + @@ -339,6 +341,7 @@ + @@ -441,6 +444,13 @@ AnagSchedeColl.aspx + + AnagTags.aspx + ASPXCodeBehind + + + AnagTags.aspx + @@ -613,6 +623,13 @@ mod_anagSchedeColl.ascx + + mod_anagTags.ascx + ASPXCodeBehind + + + mod_anagTags.ascx + mod_autocomplete.ascx ASPXCodeBehind diff --git a/CMS_SC/ToDo.txt b/CMS_SC/ToDo.txt new file mode 100644 index 0000000..28446a4 --- /dev/null +++ b/CMS_SC/ToDo.txt @@ -0,0 +1,16 @@ +TODO's + +- fare schema funzioni/utenti +- check:non mostra link documento (DEVE mostrarlo ovunque ci sia un riferimento alla SC) +- aggiunta SC a dossier: se c'è già deve creare #2, #3, ... +- SC in dossier: cancellabile (con btn come aggiungi, x SuperUser) SE non ci sono istanze misurazioni +- Misurazioni in collaudi: eliminabile in blocco x ntera SC SE NON CI SONO MISURAZIONI +- pulsanti delete dossier: condizionare a presenza items child +- FCS: mettere a livelo SC e NON dettaglio valori (modifiche in cascata) +- gestione allegati tipo FILE (blob? in scheda o "generale"?) +- In Dossier la singola SC deve avere descrizione MODIFICABILE +- NON SERVE GESTIONE STATO --> bastano FASI +- anag macchine/matricole: aggiungere 3 colonne corsa X / Y / Z +- anag tags (da aggiungere) +- anag macchine/matricole: gestione tags + diff --git a/CMS_SC/WebUserControls/mod_anagTags.ascx b/CMS_SC/WebUserControls/mod_anagTags.ascx new file mode 100644 index 0000000..21f2e1b --- /dev/null +++ b/CMS_SC/WebUserControls/mod_anagTags.ascx @@ -0,0 +1,61 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_anagTags.ascx.cs" Inherits="CMS_SC.WebUserControls.mod_anagTags" %> + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CMS_SC/WebUserControls/mod_anagTags.ascx.cs b/CMS_SC/WebUserControls/mod_anagTags.ascx.cs new file mode 100644 index 0000000..98e132f --- /dev/null +++ b/CMS_SC/WebUserControls/mod_anagTags.ascx.cs @@ -0,0 +1,45 @@ +using CMS_SC_Data; +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace CMS_SC.WebUserControls +{ + public partial class mod_anagTags : System.Web.UI.UserControl + { + protected void Page_Load(object sender, EventArgs e) + { + + } + /// + /// dimensione pagina grid view + /// + public int pageSize + { + get + { + return grView.PageSize; + } + set + { + grView.PageSize = value; + } + } + /// + /// richiesta di aggiunta record, tutto a zero! + /// + /// + /// + protected void lbAddNew_Click(object sender, EventArgs e) + { + // inserisco nuovo record + DtProxy.man.taAF.insertQuery(memLayer.ML.CRS("defAF01"), memLayer.ML.CRS("defAF02")); + // update! + grView.DataBind(); + } + } +} \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_anagTags.ascx.designer.cs b/CMS_SC/WebUserControls/mod_anagTags.ascx.designer.cs new file mode 100644 index 0000000..123dc15 --- /dev/null +++ b/CMS_SC/WebUserControls/mod_anagTags.ascx.designer.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace CMS_SC.WebUserControls { + + + public partial class mod_anagTags { + + /// + /// grView control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.GridView grView; + + /// + /// ods control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + } +} diff --git a/CMS_SC/WebUserControls/mod_testata.ascx b/CMS_SC/WebUserControls/mod_testata.ascx index d396c9d..f73e8e8 100644 --- a/CMS_SC/WebUserControls/mod_testata.ascx +++ b/CMS_SC/WebUserControls/mod_testata.ascx @@ -43,6 +43,7 @@
  • <%: traduci("AnagMatricole") %>
  • <%: traduci("AnagFasi") %>
    • +
  • <%: traduci("AnagTags") %>
  • <%: traduci("AnagSchedeColl") %>
  • <%: traduci("DettScheda") %>
    • diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index cf14767..72ccf0e 100644 Binary files a/CMS_SC/bin/CMS-SC-Data.dll and b/CMS_SC/bin/CMS-SC-Data.dll differ diff --git a/CMS_SC/bin/CMS_SC.dll b/CMS_SC/bin/CMS_SC.dll index 7be4a9b..b64bd5d 100644 Binary files a/CMS_SC/bin/CMS_SC.dll and b/CMS_SC/bin/CMS_SC.dll differ diff --git a/CMS_SC/bin/SteamWare.dll b/CMS_SC/bin/SteamWare.dll index 5804a7e..e3fbcc7 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ diff --git a/VersGen/bin/Release/VersGen.dll b/VersGen/bin/Release/VersGen.dll index ba98d3f..65be571 100644 Binary files a/VersGen/bin/Release/VersGen.dll and b/VersGen/bin/Release/VersGen.dll differ