diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx
index 1590e2e..11420ae 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx
@@ -6,7 +6,19 @@
<%: traduci("GestioneTags") %>
-
+
+
+
+
<%: traduci("lblNewTag") %>
+
+
+
+
+
<%: traduci("addNewTag") %>
+
+
+
+
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
index 9491e0f..6283e88 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.cs
@@ -13,7 +13,7 @@ namespace GIM_site.WebUserControls
protected override void Page_Load(object sender, EventArgs e)
{
base.Page_Load(sender, e);
- if(!Page.IsPostBack)
+ if (!Page.IsPostBack)
{
divDetail.Visible = false;
}
@@ -89,9 +89,7 @@ namespace GIM_site.WebUserControls
{
// reset selezione...
resetSelezione();
- // i primi valori ("0") di default sono "ND"... li inserisco come standard...
- TA_app.obj.taAnagTags.insertQuery(memLayer.ML.confReadString("newTagCode"), memLayer.ML.confReadString("newTagClass"), memLayer.ML.confReadString("newTagDescr"));
- grView.DataBind();
+ divNewTag.Visible = true;
}
///
/// verifica se il tag abbia child (= associazioni a macchine o items...)
@@ -119,20 +117,59 @@ namespace GIM_site.WebUserControls
public void doUpdate()
{
grView.DataBind();
+ hideDetail();
}
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
- if (grView.SelectedIndex >= 0)
+ if (grView.SelectedIndex >= 0)
{
divDetail.Visible = true;
mod_tag2Item.TagCode = grView.SelectedDataKey["TagCode"].ToString();
mod_tag2Macc.TagCode = grView.SelectedDataKey["TagCode"].ToString();
}
- else
+ else
{
divDetail.Visible = false;
}
}
+
+ protected void grView_RowDeleted(object sender, GridViewDeletedEventArgs e)
+ {
+ hideDetail();
+ }
+
+ private void hideDetail()
+ {
+ grView.SelectedIndex = -1;
+ divDetail.Visible = false;
+ }
+
+ protected void grView_RowUpdated(object sender, GridViewUpdatedEventArgs e)
+ {
+ hideDetail();
+ }
+
+ protected void lbtAddNew_Click(object sender, EventArgs e)
+ {
+ lblError.Text = "";
+ // verifico tag sia NUOVO...
+ string newTag = txtNewTag.Text.Trim();
+ if (TA_app.obj.taAnagTags.getByKey(newTag).Rows.Count == 0)
+ {
+ // i primi valori ("0") di default sono "ND"... li inserisco come standard...
+ TA_app.obj.taAnagTags.insertQuery(newTag, memLayer.ML.confReadString("newTagClass"), memLayer.ML.confReadString("newTagDescr"));
+ // salvo in ricerca...
+ ((FullPage)(this.Page.Master)).searchVal = newTag;
+ // update visualizzazioni
+ divNewTag.Visible = false;
+ grView.DataBind();
+ }
+ else
+ {
+ // indico tag duplicato
+ lblError.Text = traduci("RecordDuplicato");
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs
index f6195b5..05dc8b6 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_anagTags.ascx.designer.cs
@@ -12,6 +12,51 @@ namespace GIM_site.WebUserControls {
public partial class mod_anagTags {
+ ///
+ /// divNewTag control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlGenericControl divNewTag;
+
+ ///
+ /// lblNewTag control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblNewTag;
+
+ ///
+ /// txtNewTag control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.TextBox txtNewTag;
+
+ ///
+ /// lblError control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.Label lblError;
+
+ ///
+ /// lbtAddNew control.
+ ///
+ ///
+ /// Auto-generated field.
+ /// To modify move field declaration from designer file to code-behind file.
+ ///
+ protected global::System.Web.UI.WebControls.LinkButton lbtAddNew;
+
///
/// grView control.
///
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
index 506e1a2..717d86b 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tag2Item.ascx
@@ -81,8 +81,8 @@
-
+ <%----%>
<%--
diff --git a/Projects/WebGIM/GIM_site/WebUserControls/mod_tags.ascx.cs b/Projects/WebGIM/GIM_site/WebUserControls/mod_tags.ascx.cs
index fb027c8..230bbcd 100644
--- a/Projects/WebGIM/GIM_site/WebUserControls/mod_tags.ascx.cs
+++ b/Projects/WebGIM/GIM_site/WebUserControls/mod_tags.ascx.cs
@@ -59,6 +59,9 @@ namespace GIM_site.WebUserControls
{
// inverto modalità ricodifica (scambio si/no)
setMode(!_showRicodifica);
+ // update x tutto!
+ mod_anagTags.doUpdate();
+ mod_SinonimiTag.doUpdate();
}
}
}
\ No newline at end of file
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_data.dll b/Projects/WebGIM/GIM_site/bin/GIM_data.dll
index 67f2448..9eb143b 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_data.dll and b/Projects/WebGIM/GIM_site/bin/GIM_data.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/GIM_site.dll b/Projects/WebGIM/GIM_site/bin/GIM_site.dll
index da803b9..01fca4b 100644
Binary files a/Projects/WebGIM/GIM_site/bin/GIM_site.dll and b/Projects/WebGIM/GIM_site/bin/GIM_site.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/SteamWare.dll b/Projects/WebGIM/GIM_site/bin/SteamWare.dll
index 3443a74..eccc524 100644
Binary files a/Projects/WebGIM/GIM_site/bin/SteamWare.dll and b/Projects/WebGIM/GIM_site/bin/SteamWare.dll differ
diff --git a/Projects/WebGIM/GIM_site/bin/VersGen.dll b/Projects/WebGIM/GIM_site/bin/VersGen.dll
index 921f5f5..03507de 100644
Binary files a/Projects/WebGIM/GIM_site/bin/VersGen.dll and b/Projects/WebGIM/GIM_site/bin/VersGen.dll differ
diff --git a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
index 77f81da..5bb0f30 100644
--- a/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
+++ b/Projects/WebGIM/GIM_site/sql/GIM_1.5_to_1.6.sql
@@ -131,4 +131,7 @@ UPDATE vocabolario SET traduzione = 'Event Detail' WHERE lemma = 'DettIntervento
exec voc.stp_insNewLemma 'adminDB', 'DB Admin'
exec voc.stp_insNewLemma 'chLang', 'Language'
exec voc.stp_insNewLemma 'chLangIcon', 'fa fa-globe'
+exec voc.stp_insNewLemma 'lblNewTag', 'Nuova Etichetta'
+exec voc.stp_insNewLemma 'addNewTag', 'Aggiungi Etichetta'
+exec voc.stp_insNewLemma 'RecordDuplicato', 'Record Duplicato'
diff --git a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll
index 921f5f5..e10469d 100644
Binary files a/Projects/WebGIM/VersGen/bin/Release/VersGen.dll and b/Projects/WebGIM/VersGen/bin/Release/VersGen.dll differ