From b5a17eca233f014bcfc0426ffc6affca7dd0061d Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Wed, 28 Feb 2018 16:56:52 +0100 Subject: [PATCH] prima versione edit commenti (abilitati) --- MP-Tablet/Bundle.config | 1 - MP-Tablet/Content/fermate.css | 159 ---------------- MP-Tablet/Content/fermate.less | 170 ------------------ MP-Tablet/Content/fermate.min.css | 1 - MP-Tablet/MP-Tablet.csproj | 7 - MP-Tablet/Web.config | 2 +- MP-Tablet/WebUserControls/mod_commenti.ascx | 96 +++++----- .../WebUserControls/mod_commenti.ascx.cs | 122 ++++++------- .../mod_commenti.ascx.designer.cs | 41 +++-- MP-Tablet/WebUserControls/mod_fermate.ascx | 21 +-- 10 files changed, 133 insertions(+), 487 deletions(-) delete mode 100644 MP-Tablet/Content/fermate.css delete mode 100644 MP-Tablet/Content/fermate.less delete mode 100644 MP-Tablet/Content/fermate.min.css diff --git a/MP-Tablet/Bundle.config b/MP-Tablet/Bundle.config index 4acbc410..6aea9b13 100644 --- a/MP-Tablet/Bundle.config +++ b/MP-Tablet/Bundle.config @@ -6,7 +6,6 @@ - diff --git a/MP-Tablet/Content/fermate.css b/MP-Tablet/Content/fermate.css deleted file mode 100644 index fd9d8bce..00000000 --- a/MP-Tablet/Content/fermate.css +++ /dev/null @@ -1,159 +0,0 @@ -/* First breakpoint is 460px. 2 column layout. Tiles 150x150 pixels at the breakpoint. */ -@media all and (min-width: 800px) { - .elFerm .ui-content { - padding: 9px; - } - .elFerm .ui-listview .ui-li.ui-btn { - float: left; - width: 47.6%; - /* 50% incl. 2 x 1.2% margin */ - height: 40px; - margin: 9px 1.2%; - border-width: 0; - /* The 1px border would break the layout so we set it on .ui-btn-inner instead. */ - } - /* If you don't want a border at all, just set "border: none;" here to negate the semi white top border */ - .elFerm .ui-listview .ui-li.ui-btn-inner { - border: inherit; - border-width: 1px; - margin: -1px; - } - .elFerm .ui-listview .ui-btn-inner, - .elFerm .ui-listview .ui-btn-text, - .elFerm .ui-listview .ui-link-inherit, - .elFerm .ui-listview .ui-li-thumb { - width: 100%; - height: 100%; - display: block; - overflow: hidden; - } - .elFerm .ui-listview .ui-link-inherit { - padding: 0 !important; - position: relative; - } - /* Inherit the border-radius from the UL that has class .ui-corner-all in case of an inset listview. */ - .elFerm .ui-listview .ui-li, - .elFerm .ui-listview .ui-btn-text, - .elFerm .ui-listview .ui-link-inherit, - .elFerm .ui-listview .ui-li-thumb { - -webkit-border-radius: inherit; - border-radius: inherit; - } - .elFerm .ui-listview .ui-li-thumb { - height: auto; - /* To keep aspect ratio. */ - max-width: 100%; - max-height: none; - margin: 0; - left: 0; - z-index: -1; - } - /* Hide the icon */ - .elFerm .ui-listview .ui-icon { - display: none; - } - /* Make text wrap. */ - .elFerm .ui-listview .ui-li-heading, - .elFerm .ui-listview .ui-li-desc { - font-family: 'Open Sans Condensed', sans-serif; - white-space: normal; - overflow: visible; - position: absolute; - left: 0; - right: 0; - } - /* Text position */ - .elFerm .ui-listview .ui-li-heading { - margin: 0; - padding: 20px; - bottom: 40%; - } - .elFerm .ui-listview .ui-li-desc { - font-family: 'Open Sans', sans-serif; - margin: 0; - padding: 0 20px; - min-height: 40%; - bottom: 0; - line-height: 1.5; - } - /* Semi transparent background and different position if there is a thumb */ - .ui-li-dich { - background: #111; - background: rgba(0, 0, 0, 0.8); - -webkit-background-clip: padding; - background-clip: padding-box; - } - /* - .ui-listview .ui-li-has-thumb .ui-li-heading - { - padding: 10px; - bottom: 20%; - } - */ - .ui-li-dich { - padding: 0 10px; - min-height: 20%; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: inherit; - border-bottom-right-radius: inherit; - } - /* ui-li-aside has class .ui-li-desc as well so we have to override some things. */ - .elFerm .ui-listview .ui-li-desc.ui-li-aside { - padding: 2px 10px; - width: auto; - min-height: 0; - top: 0; - left: auto; - bottom: auto; - /* Custom styling. */ - color: #c0c0c0; - background: #990099; - background: rgba(153, 0, 153, 0.85); - -webkit-border-top-right-radius: inherit; - border-top-right-radius: inherit; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - } - /* If you want to add shadow, don't kill the focus style. */ - .elFerm .ui-listview .ui-btn:not(.ui-focus) { - -moz-box-shadow: 0px 0px 9px #111; - -webkit-box-shadow: 0px 0px 9px #111; - box-shadow: 0px 0px 9px #111; - } - /* Images mask the hover bg color so we give desktop users feedback by applying the focus style on hover as well. */ - .elFerm .ui-listview .ui-btn:hover { - -moz-box-shadow: 0px 0px 12px #387bbe; - -webkit-box-shadow: 0px 0px 12px #387bbe; - box-shadow: 0px 0px 12px #387bbe; - } - /* Animate focus and hover style, and resizing. */ - .elFerm .ui-listview .ui-btn { - -webkit-transition: all 500ms ease; - -moz-transition: all 500ms ease; - -o-transition: all 500ms ease; - -ms-transition: all 500ms ease; - transition: all 500ms ease; - } -} -/* Second breakpoint. 3 column layout. Tiles will be 150x150 pixels again at the breakpoint. */ -@media all and (min-width: 1300px) { - .elFerm .ui-content { - padding: 10px; - } - /* Set a max-width for the last breakpoint to prevent too much stretching on large screens. - By setting the max-width equal to the breakpoint width minus padding we keep square tiles. */ - .elFerm .ui-listview { - max-width: 800px; - margin: 0 auto; - } - /* Because of the 1000px max-width the width will always be 230px (and margin left/right 10px), - but we stick to percentage values for demo purposes. */ - .elFerm .ui-listview .ui-li.ui-btn { - width: 30%; - height: 44px; - margin: 10px 1%; - } -} \ No newline at end of file diff --git a/MP-Tablet/Content/fermate.less b/MP-Tablet/Content/fermate.less deleted file mode 100644 index b6202cdd..00000000 --- a/MP-Tablet/Content/fermate.less +++ /dev/null @@ -1,170 +0,0 @@ -/* First breakpoint is 460px. 2 column layout. Tiles 150x150 pixels at the breakpoint. */ -@media all and (min-width: 800px) -{ - .elFerm .ui-content - { - padding: 9px; - } - .elFerm .ui-listview .ui-li.ui-btn - { - float: left; - width: 47.6%; /* 50% incl. 2 x 1.2% margin */ - height: 40px; - margin: 9px 1.2%; - border-width: 0; /* The 1px border would break the layout so we set it on .ui-btn-inner instead. */ - } - /* If you don't want a border at all, just set "border: none;" here to negate the semi white top border */ - .elFerm .ui-listview .ui-li.ui-btn-inner - { - border: inherit; - border-width: 1px; - margin: -1px; - } - .elFerm .ui-listview .ui-btn-inner, .elFerm .ui-listview .ui-btn-text, .elFerm .ui-listview .ui-link-inherit, .elFerm .ui-listview .ui-li-thumb - { - width: 100%; - height: 100%; - display: block; - overflow: hidden; - } - .elFerm .ui-listview .ui-link-inherit - { - padding: 0 !important; - position: relative; - } - /* Inherit the border-radius from the UL that has class .ui-corner-all in case of an inset listview. */ - .elFerm .ui-listview .ui-li, .elFerm .ui-listview .ui-btn-text, .elFerm .ui-listview .ui-link-inherit, .elFerm .ui-listview .ui-li-thumb - { - -webkit-border-radius: inherit; - border-radius: inherit; - } - .elFerm .ui-listview .ui-li-thumb - { - height: auto; /* To keep aspect ratio. */ - max-width: 100%; - max-height: none; - margin: 0; - left: 0; - z-index: -1; - } - /* Hide the icon */ - .elFerm .ui-listview .ui-icon - { - display: none; - } - /* Make text wrap. */ - .elFerm .ui-listview .ui-li-heading, .elFerm .ui-listview .ui-li-desc - { - font-family: 'Open Sans Condensed' , sans-serif; - white-space: normal; - overflow: visible; - position: absolute; - left: 0; - right: 0; - } - /* Text position */ - .elFerm .ui-listview .ui-li-heading - { - margin: 0; - padding: 20px; - bottom: 40%; - } - .elFerm .ui-listview .ui-li-desc - { - font-family: 'Open Sans' , sans-serif; - margin: 0; - padding: 0 20px; - min-height: 40%; - bottom: 0; - line-height: 1.5; - } - /* Semi transparent background and different position if there is a thumb */ - .ui-li-dich - { - background: #111; - background: rgba(0,0,0,.8); - -webkit-background-clip: padding; - background-clip: padding-box; - } - /* - .ui-listview .ui-li-has-thumb .ui-li-heading - { - padding: 10px; - bottom: 20%; - } - */ - .ui-li-dich - { - padding: 0 10px; - min-height: 20%; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: inherit; - border-bottom-right-radius: inherit; - } - /* ui-li-aside has class .ui-li-desc as well so we have to override some things. */ - .elFerm .ui-listview .ui-li-desc.ui-li-aside - { - padding: 2px 10px; - width: auto; - min-height: 0; - top: 0; - left: auto; - bottom: auto; /* Custom styling. */ - color: #c0c0c0; - background: #990099; - background: rgba(153,0,153,.85); - -webkit-border-top-right-radius: inherit; - border-top-right-radius: inherit; - -webkit-border-bottom-left-radius: inherit; - border-bottom-left-radius: inherit; - -webkit-border-bottom-right-radius: 0; - border-bottom-right-radius: 0; - } - /* If you want to add shadow, don't kill the focus style. */ - .elFerm .ui-listview .ui-btn:not(.ui-focus) - { - -moz-box-shadow: 0px 0px 9px #111; - -webkit-box-shadow: 0px 0px 9px #111; - box-shadow: 0px 0px 9px #111; - } - /* Images mask the hover bg color so we give desktop users feedback by applying the focus style on hover as well. */ - .elFerm .ui-listview .ui-btn:hover - { - -moz-box-shadow: 0px 0px 12px #387bbe; - -webkit-box-shadow: 0px 0px 12px #387bbe; - box-shadow: 0px 0px 12px #387bbe; - } - /* Animate focus and hover style, and resizing. */ - .elFerm .ui-listview .ui-btn - { - -webkit-transition: all 500ms ease; - -moz-transition: all 500ms ease; - -o-transition: all 500ms ease; - -ms-transition: all 500ms ease; - transition: all 500ms ease; - } -} -/* Second breakpoint. 3 column layout. Tiles will be 150x150 pixels again at the breakpoint. */ -@media all and (min-width: 1300px) -{ - .elFerm .ui-content - { - padding: 10px; - } - /* Set a max-width for the last breakpoint to prevent too much stretching on large screens. - By setting the max-width equal to the breakpoint width minus padding we keep square tiles. */ - .elFerm .ui-listview - { - max-width: 800px; - margin: 0 auto; - } - /* Because of the 1000px max-width the width will always be 230px (and margin left/right 10px), - but we stick to percentage values for demo purposes. */ - .elFerm .ui-listview .ui-li.ui-btn - { - width: 30%; - height: 44px; - margin: 10px 1%; - } -} \ No newline at end of file diff --git a/MP-Tablet/Content/fermate.min.css b/MP-Tablet/Content/fermate.min.css deleted file mode 100644 index 3d8150b5..00000000 --- a/MP-Tablet/Content/fermate.min.css +++ /dev/null @@ -1 +0,0 @@ -@media all and (min-width:800px){.elFerm .ui-content{padding:9px;}.elFerm .ui-listview .ui-li.ui-btn{float:left;width:47.6%;height:40px;margin:9px 1.2%;border-width:0;}.elFerm .ui-listview .ui-li.ui-btn-inner{border:inherit;border-width:1px;margin:-1px;}.elFerm .ui-listview .ui-btn-inner,.elFerm .ui-listview .ui-btn-text,.elFerm .ui-listview .ui-link-inherit,.elFerm .ui-listview .ui-li-thumb{width:100%;height:100%;display:block;overflow:hidden;}.elFerm .ui-listview .ui-link-inherit{padding:0 !important;position:relative;}.elFerm .ui-listview .ui-li,.elFerm .ui-listview .ui-btn-text,.elFerm .ui-listview .ui-link-inherit,.elFerm .ui-listview .ui-li-thumb{-webkit-border-radius:inherit;border-radius:inherit;}.elFerm .ui-listview .ui-li-thumb{height:auto;max-width:100%;max-height:none;margin:0;left:0;z-index:-1;}.elFerm .ui-listview .ui-icon{display:none;}.elFerm .ui-listview .ui-li-heading,.elFerm .ui-listview .ui-li-desc{font-family:'Open Sans Condensed',sans-serif;white-space:normal;overflow:visible;position:absolute;left:0;right:0;}.elFerm .ui-listview .ui-li-heading{margin:0;padding:20px;bottom:40%;}.elFerm .ui-listview .ui-li-desc{font-family:'Open Sans',sans-serif;margin:0;padding:0 20px;min-height:40%;bottom:0;line-height:1.5;}.ui-li-dich{background:#111;background:rgba(0,0,0,.8);-webkit-background-clip:padding;background-clip:padding-box;}.ui-li-dich{padding:0 10px;min-height:20%;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:inherit;border-bottom-right-radius:inherit;}.elFerm .ui-listview .ui-li-desc.ui-li-aside{padding:2px 10px;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.85);-webkit-border-top-right-radius:inherit;border-top-right-radius:inherit;-webkit-border-bottom-left-radius:inherit;border-bottom-left-radius:inherit;-webkit-border-bottom-right-radius:0;border-bottom-right-radius:0;}.elFerm .ui-listview .ui-btn:not(.ui-focus){-moz-box-shadow:0 0 9px #111;-webkit-box-shadow:0 0 9px #111;box-shadow:0 0 9px #111;}.elFerm .ui-listview .ui-btn:hover{-moz-box-shadow:0 0 12px #387bbe;-webkit-box-shadow:0 0 12px #387bbe;box-shadow:0 0 12px #387bbe;}.elFerm .ui-listview .ui-btn{-webkit-transition:all 500ms ease;-moz-transition:all 500ms ease;-o-transition:all 500ms ease;-ms-transition:all 500ms ease;transition:all 500ms ease;}}@media all and (min-width:1300px){.elFerm .ui-content{padding:10px;}.elFerm .ui-listview{max-width:800px;margin:0 auto;}.elFerm .ui-listview .ui-li.ui-btn{width:30%;height:44px;margin:10px 1%;}} \ No newline at end of file diff --git a/MP-Tablet/MP-Tablet.csproj b/MP-Tablet/MP-Tablet.csproj index 64111c24..4776b9f0 100644 --- a/MP-Tablet/MP-Tablet.csproj +++ b/MP-Tablet/MP-Tablet.csproj @@ -164,12 +164,6 @@ dichMan.less - - fermate.less - - - fermate.less - fonts.less @@ -292,7 +286,6 @@ - diff --git a/MP-Tablet/Web.config b/MP-Tablet/Web.config index 1110d0c2..f61916db 100644 --- a/MP-Tablet/Web.config +++ b/MP-Tablet/Web.config @@ -73,7 +73,7 @@ - + diff --git a/MP-Tablet/WebUserControls/mod_commenti.ascx b/MP-Tablet/WebUserControls/mod_commenti.ascx index 0e6699c4..1e9f3100 100644 --- a/MP-Tablet/WebUserControls/mod_commenti.ascx +++ b/MP-Tablet/WebUserControls/mod_commenti.ascx @@ -1,52 +1,54 @@ <%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_commenti.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_commenti" %> + +
- -
- - - - - - -
-
    - - -
  • -
    - -
    -
    - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    -
    - -
    -
    - - -
    -
    -
    -
    -
    • -     -     -
+ + + + + + + + +
+ + +
+
+
+ + + +
+
+ +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ + +
+
+
+
+ + - - - - + + + + +
diff --git a/MP-Tablet/WebUserControls/mod_commenti.ascx.cs b/MP-Tablet/WebUserControls/mod_commenti.ascx.cs index 1b1d9aea..0c8d1cca 100644 --- a/MP-Tablet/WebUserControls/mod_commenti.ascx.cs +++ b/MP-Tablet/WebUserControls/mod_commenti.ascx.cs @@ -6,75 +6,61 @@ using System.Web.UI.WebControls; namespace MoonProTablet.WebUserControls { - public partial class mod_commenti : System.Web.UI.UserControl + public partial class mod_commenti : System.Web.UI.UserControl + { + /// + /// registrata richiesta + /// + public event EventHandler eh_reqEdit; + + protected void Page_Load(object sender, EventArgs e) { - /// - /// registrata richiesta - /// - public event EventHandler eh_reqEdit; - protected void Page_Load(object sender, EventArgs e) - { - - } - /// - /// abilitazione edit commenti - /// - public bool enableEdit - { - get - { - return memLayer.ML.confReadBool("commEnableEditDel"); - } - } - - public void doUpdate() - { - repComm.DataBind(); - } - - /// - /// carico x edit commento - /// - /// - /// - protected void btnEdit_Click(object sender, ImageClickEventArgs e) - { - ImageButton imgBtn = (ImageButton)sender; - DateTime inizioStato = Convert.ToDateTime(imgBtn.CommandArgument); - memLayer.ML.setSessionVal("inizioStato", inizioStato); - // sollevo evento! - if (eh_reqEdit != null) - { - eh_reqEdit(this, new EventArgs()); - } - - - //string idxMacchina = memLayer.ML.StringSessionObj("idxMacchina"); - //DS_applicazione.EventListRow riga = null; - //try - //{ - // riga = DataLayer.obj.taEventi.GetByMacchinaPeriodo(idxMacchina, inizioStato, inizioStato)[0]; - //txtDate.Text = riga.InizioStato.ToString("yyyy-MM-dd"); - //txtTime.Text = riga.InizioStato.ToString("HH:mm"); - //txtCommento.Text = riga.Value; - //} - //catch - //{ } - //fixPanels(false, true, false); - } - /// - /// elimina commento - /// - /// - /// - protected void btnDel_Click(object sender, ImageClickEventArgs e) - { - ImageButton imgBtn = (ImageButton)sender; - DateTime inizioStato = Convert.ToDateTime(imgBtn.CommandArgument); - string idxMacchina = memLayer.ML.StringSessionObj("idxMacchina"); - DataLayer.obj.taEventi.DeleteQuery(idxMacchina, inizioStato); - doUpdate(); - } } + /// + /// abilitazione edit commenti + /// + public bool enableEdit + { + get + { + return memLayer.ML.confReadBool("commEnableEditDel"); + } + } + + public void doUpdate() + { + repComm.DataBind(); + } + + /// + /// carico x edit commento + /// + /// + /// + protected void lbtEdit_Click(object sender, EventArgs e) + { + LinkButton imgBtn = (LinkButton)sender; + DateTime inizioStato = Convert.ToDateTime(imgBtn.CommandArgument); + memLayer.ML.setSessionVal("inizioStato", inizioStato); + // sollevo evento! + if (eh_reqEdit != null) + { + eh_reqEdit(this, new EventArgs()); + } + } + /// + /// elimina commento + /// + /// + /// + protected void lbtDel_Click(object sender, EventArgs e) + { + LinkButton imgBtn = (LinkButton)sender; + DateTime inizioStato = Convert.ToDateTime(imgBtn.CommandArgument); + string idxMacchina = memLayer.ML.StringSessionObj("idxMacchina"); + DataLayer.obj.taEventi.DeleteQuery(idxMacchina, inizioStato); + doUpdate(); + } + } } \ No newline at end of file diff --git a/MP-Tablet/WebUserControls/mod_commenti.ascx.designer.cs b/MP-Tablet/WebUserControls/mod_commenti.ascx.designer.cs index b15874d1..f9c51c51 100644 --- a/MP-Tablet/WebUserControls/mod_commenti.ascx.designer.cs +++ b/MP-Tablet/WebUserControls/mod_commenti.ascx.designer.cs @@ -1,51 +1,50 @@ //------------------------------------------------------------------------------ -// -// This code was generated by a tool. +// +// Codice generato da uno strumento. // -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// //------------------------------------------------------------------------------ -namespace MoonProTablet.WebUserControls -{ - - +namespace MoonProTablet.WebUserControls { + + public partial class mod_commenti { /// - /// lblNumGG control. + /// Controllo lblNumGG. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Label lblNumGG; /// - /// rblPageSize control. + /// Controllo rblPageSize. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.RadioButtonList rblPageSize; /// - /// repComm control. + /// Controllo repComm. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.Repeater repComm; /// - /// odsComm control. + /// Controllo odsComm. /// /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.ObjectDataSource odsComm; } diff --git a/MP-Tablet/WebUserControls/mod_fermate.ascx b/MP-Tablet/WebUserControls/mod_fermate.ascx index 86ce94bc..b24a64e7 100644 --- a/MP-Tablet/WebUserControls/mod_fermate.ascx +++ b/MP-Tablet/WebUserControls/mod_fermate.ascx @@ -39,16 +39,17 @@
-
+
-

-

-
+ + + +
-
+
-
-
+
+
@@ -56,11 +57,7 @@
- -
- - - +