diff --git a/CMS-SC-Data/DS_Applicazione.Designer.cs b/CMS-SC-Data/DS_Applicazione.Designer.cs index 67a5e3e..7bc10a8 100644 --- a/CMS-SC-Data/DS_Applicazione.Designer.cs +++ b/CMS-SC-Data/DS_Applicazione.Designer.cs @@ -6151,6 +6151,8 @@ namespace CMS_SC_Data { private global::System.Data.DataColumn columnStato; + private global::System.Data.DataColumn columnDescrStato; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public StatoCollaudiDataTable() { @@ -6296,6 +6298,14 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn DescrStatoColumn { + get { + return this.columnDescrStato; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -6333,7 +6343,7 @@ namespace CMS_SC_Data { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public StatoCollaudiRow AddStatoCollaudiRow(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, string opz, string FasiEnab, int Ordinale, string Fase, int TotMisure, int MisEffettuate, int MisOk, int MisOkDerog, int Stato) { + public StatoCollaudiRow AddStatoCollaudiRow(int IdxDossier, string CodScheda, int Vers, int NumScheda, string Descrizione, string opz, string FasiEnab, int Ordinale, string Fase, int TotMisure, int MisEffettuate, int MisOk, int MisOkDerog, int Stato, string DescrStato) { StatoCollaudiRow rowStatoCollaudiRow = ((StatoCollaudiRow)(this.NewRow())); object[] columnValuesArray = new object[] { IdxDossier, @@ -6349,7 +6359,8 @@ namespace CMS_SC_Data { MisEffettuate, MisOk, MisOkDerog, - Stato}; + Stato, + DescrStato}; rowStatoCollaudiRow.ItemArray = columnValuesArray; this.Rows.Add(rowStatoCollaudiRow); return rowStatoCollaudiRow; @@ -6396,6 +6407,7 @@ namespace CMS_SC_Data { this.columnMisOk = base.Columns["MisOk"]; this.columnMisOkDerog = base.Columns["MisOkDerog"]; this.columnStato = base.Columns["Stato"]; + this.columnDescrStato = base.Columns["DescrStato"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6429,6 +6441,8 @@ namespace CMS_SC_Data { base.Columns.Add(this.columnMisOkDerog); this.columnStato = new global::System.Data.DataColumn("Stato", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnStato); + this.columnDescrStato = new global::System.Data.DataColumn("DescrStato", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnDescrStato); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnIdxDossier, this.columnCodScheda, @@ -6448,6 +6462,7 @@ namespace CMS_SC_Data { this.columnFase.AllowDBNull = false; this.columnFase.MaxLength = 50; this.columnStato.ReadOnly = true; + this.columnDescrStato.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -8925,6 +8940,22 @@ namespace CMS_SC_Data { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string DescrStato { + get { + try { + return ((string)(this[this.tableStatoCollaudi.DescrStatoColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("The value for column \'DescrStato\' in table \'StatoCollaudi\' is DBNull.", e); + } + } + set { + this[this.tableStatoCollaudi.DescrStatoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsDescrizioneNull() { @@ -8996,6 +9027,18 @@ namespace CMS_SC_Data { public void SetStatoNull() { this[this.tableStatoCollaudi.StatoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsDescrStatoNull() { + return this.IsNull(this.tableStatoCollaudi.DescrStatoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetDescrStatoNull() { + this[this.tableStatoCollaudi.DescrStatoColumn] = global::System.Convert.DBNull; + } } /// @@ -16425,6 +16468,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa tableMapping.ColumnMappings.Add("MisOk", "MisOk"); tableMapping.ColumnMappings.Add("MisOkDerog", "MisOkDerog"); tableMapping.ColumnMappings.Add("Stato", "Stato"); + tableMapping.ColumnMappings.Add("DescrStato", "DescrStato"); this._adapter.TableMappings.Add(tableMapping); } @@ -16441,9 +16485,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordina" + - "le, Fase, TotMisure, MisEffettuate, MisOk, MisOkDerog, Stato FROM dbo.v_statoCol" + - "laudi"; + this._commandCollection[0].CommandText = "SELECT * FROM v_statoCollaudi"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; diff --git a/CMS-SC-Data/DS_Applicazione.xsd b/CMS-SC-Data/DS_Applicazione.xsd index e054cf9..2ecb1a7 100644 --- a/CMS-SC-Data/DS_Applicazione.xsd +++ b/CMS-SC-Data/DS_Applicazione.xsd @@ -1431,10 +1431,10 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa - + - - SELECT IdxDossier, CodScheda, Vers, NumScheda, Descrizione, opz, FasiEnab, Ordinale, Fase, TotMisure, MisEffettuate, MisOk, MisOkDerog, Stato FROM dbo.v_statoCollaudi + + SELECT * FROM v_statoCollaudi @@ -1455,6 +1455,7 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + @@ -2138,6 +2139,13 @@ SELECT Email, ParName, ParValue FROM UserParam WHERE (Email = @Email) AND (ParNa + + + + + + + diff --git a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll index f64d7d2..fef9594 100644 Binary files a/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/bin/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/bin/Debug/SteamWare.dll b/CMS-SC-Data/bin/Debug/SteamWare.dll index 662fcaf..b27eb30 100644 Binary files a/CMS-SC-Data/bin/Debug/SteamWare.dll and b/CMS-SC-Data/bin/Debug/SteamWare.dll differ diff --git a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll index f64d7d2..fef9594 100644 Binary files a/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll and b/CMS-SC-Data/obj/Debug/CMS-SC-Data.dll differ diff --git a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll index 602d197..50fff90 100644 Binary files a/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll and b/CMS-SC-Data/obj/Debug/TempPE/DS_Applicazione.Designer.cs.dll differ diff --git a/CMS_SC/Content/Style.css b/CMS_SC/Content/Style.css index 67d8e84..e2c9df2 100644 --- a/CMS_SC/Content/Style.css +++ b/CMS_SC/Content/Style.css @@ -65,6 +65,28 @@ a:focus { .bg-default { background-color: white; } +/* Formato stato scheda collaudo */ +.sc { + font-weight: bold; +} +.sc_0 { + color: #666; +} +.sc_1 { + color: #bababa; +} +.sc_2 { + color: black; +} +.sc_3 { + color: #FF3333; +} +.sc_4 { + color: #CCCC66; +} +.sc_5 { + color: #00bd00; +} /* formato testo commento compatto */ .didascalia { color: #696969; diff --git a/CMS_SC/Content/Style.less b/CMS_SC/Content/Style.less index 942dade..15143aa 100644 --- a/CMS_SC/Content/Style.less +++ b/CMS_SC/Content/Style.less @@ -81,7 +81,28 @@ a:focus { } - +/* Formato stato scheda collaudo */ +.sc{ + font-weight: bold; +} +.sc_0{ + color: #666; +} +.sc_1{ + color: #bababa; +} +.sc_2{ + color: black; +} +.sc_3{ + color: #FF3333; +} +.sc_4{ + color: #CCCC66; +} +.sc_5{ + color: #00bd00; +} /* formato testo commento compatto */ .didascalia { diff --git a/CMS_SC/Content/Style.min.css b/CMS_SC/Content/Style.min.css index 356753d..5ead39e 100644 --- a/CMS_SC/Content/Style.min.css +++ b/CMS_SC/Content/Style.min.css @@ -1 +1 @@ -#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#f5f5f5 0%,#e2e2e2 100%)}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#ededed;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{border-color:#9cf;border-width:2px}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:2px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{min-width:160px;min-height:100px;display:inline-block;padding:8px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555 !important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){.subnav-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}}@media(min-width:1200px){.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}}.GridPager a,.GridPager span{display:block;height:1.6em;width:2em;text-align:center;text-decoration:none}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file +#uppFeatured{margin-top:78px}.table{margin:.25em}.table-striped>tbody>tr:nth-child(odd)>th{background-image:linear-gradient(to bottom,#f5f5f5 0%,#e2e2e2 100%)}.table>thead>tr>th,.table>tbody>tr>th,.table>tfoot>tr>th,.table>thead>tr>td,.table>tbody>tr>td,.table>tfoot>tr>td{padding:2px}.input-group-sm>.form-control,.input-group-sm>.input-group-addon,.input-group-sm>.input-group-btn>.btn{height:30px;padding:4px 8px;font-size:12px;line-height:1.5;border-radius:3px}.paginatore{text-align:center;margin:auto}.paginatore>td>table>tbody>tr>td{padding:0 4px}.paginatore>td>table>tbody>tr>td>a{text-decoration:underline}body{font:12px/1.5em 'Open Sans';color:#333;background-color:#fafafa}a{color:#f90;text-decoration:none}a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}.divHalf{width:50%;float:left}.bottomLine{padding-bottom:1px;border-bottom:1px solid #ccc}.bg-default{background-color:#fff}.sc{font-weight:bold}.sc_0{color:#666}.sc_1{color:#bababa}.sc_2{color:#000}.sc_3{color:#f33}.sc_4{color:#cc6}.sc_5{color:#00bd00}.didascalia{color:#696969;font-size:7pt}.didascaliaMed{color:#696969;font-size:9pt}.menuAddNew{padding:4px;background-color:#d0eeee;font-size:1.2em}.warnRed{color:#f00}.warnOrange{color:#ffa500}.allOk{color:#008000}.running{color:#242499}.navbar{min-height:15px}.navbar-text{margin-top:1px;margin-bottom:1px}.navbar.navbar-inverse .navbar-form .search-query{width:225px;margin-top:2px;background-color:#ededed;font-size:11px;font-weight:bold;line-height:20px;border-color:#000;border-radius:20px;box-shadow:inset 0 1px 2px rgba(0,0,0,.1),0 1px 0 rgba(255,255,255,.15)}.navbar.navbar-inverse .navbar-form .search-query:focus{border-color:#9cf;border-width:2px}.navbar.navbar-inverse .navbar-form .search-query::-webkit-input-placeholder{color:#666}.navbar.navbar-inverse .navbar-form .search-query::-moz-placeholder{color:#666}.titleBar{color:#f90}.navbar-brand{padding-left:20px;margin-top:-10px}.subnavbar{margin-bottom:.5em}.subnavbar .subnav-toggle{display:none;padding:.5em 0;margin:0 auto;font-size:18px;text-align:center;color:#f90}.subnavbar .subnav-toggle:hover{text-decoration:none}.subnavbar .subnavbar-inner{height:70px;border-bottom:1px solid #000}.subnavbar .btn-subnavbar{display:none;padding:10px 0 8px;color:#f90;font-size:16px;text-align:center;cursor:pointer}.subnavbar .btn-subnavbar:hover{text-decoration:none}.subnavbar .dropdown .caret{margin-top:-16px;border-bottom-color:#888;opacity:35;filter:alpha(opacity=3500)}.subnavbar .dropdown.open .caret{display:none}.subnavbar .mainnav{display:inline-block;height:70px;padding:0;margin:0}.subnavbar .mainnav>li{float:left;min-width:80px;height:70px;padding:0;margin:0;text-align:center;list-style:none}.subnavbar .mainnav>li>a{display:block;height:100%;padding:0 15px;font-size:12px;font-weight:bold;color:#363636;text-shadow:1px 1px 1px rgba(0,0,0,.2)}.subnavbar .mainnav>li>a:hover{color:#888;text-decoration:none}.subnavbar .mainnav>li>a>i{position:relative;top:2px;display:inline-block;width:24px;height:24px;margin-top:2px;margin-bottom:9px;font-size:28px}.subnavbar .mainnav>li>a>span{display:block;padding-bottom:2px}.subnavbar .mainnav>li.open>a{text-decoration:none}.subnavbar .mainnav>li.active>a{background:#333;color:#33afff}.subnavbar .mainnav>li.active>a .caret{border-top-color:#33afff;border-bottom-color:#33afff}.subnavbar .dropdown>.dropdown-menu{top:97%;text-align:left;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.subnavbar .dropdown>.dropdown-menu a{font-size:12px}.subnavbar .dropdown>.dropdown-menu::before,.subnavbar .dropdown>.dropdown-menu::after{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0,0,0,.2);position:absolute;top:-7px;left:9px}.subnavbar .dropdown>.dropdown-menu::after{border-left-width:6px;border-right-width:6px;border-bottom-width:6px;border-bottom-color:#fff;top:-6px;left:10px}.subnavbar .dropdown-submenu .dropdown-menu:after,.subnavbar .dropdown-submenu .dropdown-menu:before{display:none}.subnavbar .subnav-collapse.collapse{height:auto\9;overflow:visible\9}.shortcuts{text-align:center}.shortcuts .shortcut{min-width:160px;min-height:100px;display:inline-block;padding:8px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut-sm{min-width:90px;min-height:60px;display:inline-block;padding:5px 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:10px}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:36px;color:#555}.shortcuts .shortcut:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut-sm:hover{background:#e8e8e8;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fafafa),to(#e1e1e1));background-image:-webkit-linear-gradient(top,#fafafa,0%,#e1e1e1,100%);background-image:-moz-linear-gradient(top,#fafafa 0%,#e1e1e1 100%);background-image:linear-gradient(to bottom,#fafafa 0%,#e1e1e1 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffafafa',endColorstr='#ffe1e1e1',GradientType=0)}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.shortcuts .shortcut:hover .shortcut-icon{color:#666}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666}.widget{position:relative;clear:both;width:auto;margin-bottom:2em}.widget .widget-header{position:relative;height:40px;line-height:40px;background:#e9e9e9;background:-moz-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-webkit-gradient(linear,left top,left bottom,color-stop(0%,#fafafa),color-stop(100%,#e9e9e9));background:-webkit-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-o-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:-ms-linear-gradient(top,#fafafa 0%,#e9e9e9 100%);background:linear-gradient(top,#fafafa 0%,#e9e9e9 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA',endColorstr='#E9E9E9');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr='#FAFAFA', endColorstr='#E9E9E9')";border:1px solid #d5d5d5;-webkit-border-top-left-radius:4px;-webkit-border-top-right-radius:4px;-moz-border-radius-topleft:4px;-moz-border-radius-topright:4px;border-top-left-radius:4px;border-top-right-radius:4px;-webkit-background-clip:padding-box}.widget .widget-header h3{top:0;position:relative;left:10px;display:inline-block;margin-right:3em;font-size:15px;font-weight:400;color:#555;line-height:18px;text-shadow:1px 1px 2px rgba(255,255,255,.5)}.widget .widget-header [class^="fa-"],.widget .widget-header [class*=" fa-"]{display:inline-block;margin-top:-3px;margin-left:13px;margin-right:-2px;font-size:16px;color:#555;vertical-align:middle}.widget .widget-content{padding:25px 15px 15px;background:#fff;border:1px solid #d5d5d5;-moz-border-radius:5px;-webkit-border-radius:5px;border-radius:5px}.widget .widget-header+.widget-content{border-top:none;-webkit-border-top-left-radius:0;-webkit-border-top-right-radius:0;-moz-border-radius-topleft:0;-moz-border-radius-topright:0;border-top-left-radius:0;border-top-right-radius:0}.widget.widget-nopad .widget-content{padding:0}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget .widget-content:before,.widget .widget-content:after{content:" ";display:table}.widget .widget-content:after{clear:both}.widget.widget-table .widget-content{padding:0}.widget.widget-table .table{margin-bottom:0;border:none}.widget.widget-table .table tr td:first-child,.widget.widget-table .table tr th:first-child{border-left:none}.widget.widget-plain{background:transparent;border:none}.widget.widget-plain .widget-content{padding:0;background:transparent;border:none}.widget.widget-box .widget-content{background:#e3e3e3;background:#fff}.stacked{position:relative}.stacked:after,.stacked:before{content:'';position:absolute;display:block;height:1px;bottom:-2px;left:3px;right:3px;background-color:#fff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;border:1px solid #d3d3d3;border-top:0}.stacked:before{bottom:-4px;left:6px;right:6px}.stats{width:100%;display:table;padding:0 0 0 10px;margin-top:.5em;margin-bottom:1.9em}.stats .stat{display:table-cell;width:40%;vertical-align:top;font-size:11px;font-weight:bold;color:#999}.stat-value{display:block;margin-bottom:.55em;font-size:30px;font-weight:bold;letter-spacing:-2px;color:#444}.stat-time{text-align:center;padding-top:1.5em}.stat-time .stat-value{color:#f90;font-size:40px}.stats #donut-chart{height:100px;margin-left:-20px}.news-items{padding:0;margin:1em 0 0}.news-items li{display:table;padding:0 2em 0 1.5em;padding-bottom:1em;margin-bottom:1em;border-bottom:1px dotted #ccc}.news-items li:last-child{padding-bottom:0;border:none}.news-item-date{display:table-cell}.news-item-detail{display:table-cell}.news-item-title{font-size:13px;font-weight:600}.news-item-date{width:75px;vertical-align:middle;text-align:right}.news-item-day{display:block;margin-bottom:.25em;font-size:24px;color:#888}.news-item-preview{margin-bottom:0;color:#777}.news-item-month{display:block;padding-right:1px;font-size:12px;font-weight:600;color:#888}.action-table .btn-small{padding:4px 5px 5px;font-size:10px}.action-table .td-actions{width:80px;text-align:center}.action-table .td-actions .btn{margin-right:.5em}.action-table .td-actions .btn:last-child{margin-rigth:0}@media(max-width:480px){.stats .stat{margin-bottom:3em}.stats .stat .stat-value{margin-bottom:.15em;font-size:20px}.stats{float:left;display:block;margin-bottom:0}#chart-stats{margin:2em 0 1em}}@media(max-width:480px){.error-container h1{font-size:72px}.shortcuts .shortcut{width:95px}.shortcuts .shortcut .shortcut-label{font-size:12px}.shortcuts .shortcut .shortcut-icon{font-size:24px}}@media(max-width:979px){.navbar-fixed-top{position:static;margin-bottom:0}.navbar .btn-navbar{font-size:18px;background:none;filter:none;border:none;-webkit-box-shadow:none;box-shadow:none}.navbar .container{padding:0 10px}.subnavbar .subnavbar .container{width:auto}}@media(max-width:768px){.navbar{padding-left:10px;padding-right:10px;margin-right:-20px;margin-left:-20px}.navbar .navbar-nav>li>.dropdown-menu::before,.navbar .navbar-nav>li>.dropdown-menu::after{display:none}.subnavbar .subnav-toggle{display:block}#main{padding:0 10px;margin-right:-20px;margin-left:-20px}.extra{margin-right:-20px;margin-left:-20px}.main .container{padding:0}.main .row{margin-right:-15px;margin-left:-15px}.footer{margin-right:-20px;margin-left:-20px}.footer #footer-terms{margin-top:1em;text-align:left}.footer #footer-terms a{margin-left:0;margin-right:1em}.item-row{display:block}.item-row:before,.item-row:after{content:" ";display:table}.item-row:after{clear:both}.item-row .item-label{display:block;width:100%;margin-bottom:1.5em}.item-row .item-content{display:block;width:100%}.subnavbar{margin-left:-20px;margin-right:-20px}.subnavbar .btn-subnavbar{display:block}.subnavbar .subnavbar-inner{height:auto}.subnavbar .mainnav{display:block;width:100%;height:auto;margin-top:1em;margin-bottom:1.5em;border:none}.subnavbar .mainnav>li{float:none;width:100%;height:auto;margin-bottom:1em;text-align:left;border:none}.subnavbar .mainnav>li>a{display:block;padding-top:5px;padding-bottom:5px;margin-right:.5em;color:#ccc;font-size:13px;font-weight:600}.subnavbar .mainnav>li>a>span{display:inline}.subnavbar .mainnav>li>a>i{display:inline;margin-right:.5em;margin-bottom:0;font-size:14px}.subnavbar .mainnav>li>a .caret{margin-top:-2px;margin-left:3px}.subnavbar .mainnav>li.active>a{color:#f90;background:transparent}.subnavbar .dropdown .dropdown-menu{position:static;float:none;width:100%;background:transparent;border:none;box-shadow:none}.subnavbar .dropdown .dropdown-menu a{padding:12px 40px;color:#fff;font-weight:600}.subnavbar .dropdown .dropdown-menu a:active,.subnavbar .dropdown .dropdown-menu a:focus{background:#555 !important;outline:none}.subnavbar .dropdown .dropdown-menu::before,.subnavbar .dropdown .dropdown-menu::after{display:none}.subnavbar .dropdown.open .caret{display:inline-block}.subnavbar .dropdown-submenu>a:after{display:none}.subnavbar .dropdown-submenu>.dropdown-menu{display:block}.subnavbar .dropdown-submenu>.dropdown-menu>li>a{padding-right:20px;padding-left:60px}}@media(min-width:768px){.subnav-collapse.collapse{display:block !important;height:auto !important;padding-bottom:0;overflow:visible !important}}@media(min-width:1200px){.navbar .container,.subnavbar .container{padding-right:0;padding-left:0}.page-title{margin-left:-15px}}.GridPager a,.GridPager span{display:block;height:1.6em;width:2em;text-align:center;text-decoration:none}.GridPager a{background-color:#f5f5f5;color:#969696}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold}.hiddenBtn{height:0;width:0;visibility:hidden}.checkOk{color:#9f9}.checkKo{color:#5f2121} \ No newline at end of file diff --git a/CMS_SC/StatoDossiers.aspx b/CMS_SC/StatoDossiers.aspx index df4ce2d..de19a69 100644 --- a/CMS_SC/StatoDossiers.aspx +++ b/CMS_SC/StatoDossiers.aspx @@ -25,12 +25,21 @@
-

<%: traduci("StatoCollaudi") %>

+
+
+

<%: traduci("StatoCollaudi") %>

+
+
+ + + +
+
- +
diff --git a/CMS_SC/StatoDossiers.aspx.cs b/CMS_SC/StatoDossiers.aspx.cs index 51de33e..73993e9 100644 --- a/CMS_SC/StatoDossiers.aspx.cs +++ b/CMS_SC/StatoDossiers.aspx.cs @@ -23,11 +23,56 @@ namespace CMS_SC ((Bootstrap)this.Master).showSearch = true; mod_righePag.numRowPag = 20; mod_StatoCollaudi.pageSize = mod_righePag.numRowPag; + tryGetParam(); } mod_righePag.eh_newNum += mod_righePag_eh_newNum; mod_elencoDossiers.eh_selezioneValore += mod_elencoDossiers_eh_selezioneValore; } - + /// + /// cerca di recuperare i 3 parametri selezionati dall'utente (SE ci sono su DB) + /// + private void tryGetParam() + { + // rileggo SE CI SONO i parametri filtrati... + if (getPar("ddlFase") != "") + { + ddlFase.DataBind(); + try + { + ddlFase.SelectedValue = getPar("ddlFase"); + mod_StatoCollaudi.Fase = ddlFase.SelectedValue; + } + catch + { + ddlFase.SelectedIndex = 0; + } + } + } + /// + /// recupera (se c'è) da db il parametro selezionato dall'utente + /// + /// + /// + protected string getPar(string paramName) + { + string answ = ""; + try + { + answ = DtProxy.man.taUsrPar.getByKey(OpAuth.currAuth.email, paramName)[0].ParValue; + } + catch + { } + return answ; + } + /// + /// salva su DB il parametro scelto dall'utente + /// + /// + /// + protected void savePar(string paramName, string paramValue) + { + DtProxy.man.taUsrPar.upsert(OpAuth.currAuth.email, paramName, paramValue); + } private void Mod_dossier_eh_valUpdated(object sender, EventArgs e) { mod_elencoDossiers.DataBind(); @@ -60,17 +105,12 @@ namespace CMS_SC mod_StatoCollaudi.pageSize = mod_righePag.numRowPag; } - /// - /// aggiungo scheda selezionata - /// - /// - /// - protected void btnInsMisFasi_Click(object sender, EventArgs e) + protected void ddlFase_SelectedIndexChanged(object sender, EventArgs e) { - // inserisco tutte le schede da template x tutte le fasi indicate nella struttura di setup... - DtProxy.man.taSCM.insMisFasiMissing(mod_elencoDossiers.idxDossier); - mod_elencoDossiers.doUpdate(); - mod_StatoCollaudi.doUpdate(); + // salvo! + savePar("ddlFase", ddlFase.SelectedValue); + // fix visualizzazione + mod_StatoCollaudi.Fase = ddlFase.SelectedValue; } } } \ No newline at end of file diff --git a/CMS_SC/StatoDossiers.aspx.designer.cs b/CMS_SC/StatoDossiers.aspx.designer.cs index 0bc0d37..3fe2478 100644 --- a/CMS_SC/StatoDossiers.aspx.designer.cs +++ b/CMS_SC/StatoDossiers.aspx.designer.cs @@ -30,6 +30,24 @@ namespace CMS_SC { /// protected global::System.Web.UI.HtmlControls.HtmlGenericControl divDetail; + /// + /// ddlFase control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlFase; + + /// + /// odsFase control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsFase; + /// /// mod_StatoCollaudi control. /// diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx index e53a681..fce67b1 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx @@ -4,7 +4,7 @@ - + <%--   @@ -12,58 +12,46 @@ + --%> + + +
+
+ +
+
+ +
+
+ +
+
+ + <%-- - - - - <%# traduci("moveMis") %> - - - - -
- -
-
- -
- - - - - - - - - - - - + + + + + + --%> + <%-- + + + + --%> - - - - - - - + + - - - - - - - - - + diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs index c67543a..8c91a52 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.cs @@ -59,6 +59,21 @@ namespace CMS_SC.WebUserControls grView.DataBind(); } } + /// + /// dossier selezionato + /// + public string Fase + { + get + { + return hfFase.Value; + } + set + { + hfFase.Value = value; + grView.DataBind(); + } + } public void doUpdate() { grView.DataBind(); @@ -71,34 +86,11 @@ namespace CMS_SC.WebUserControls protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // verifico se ho un argomento di tipo moveUp / moveDown... quale comando? - string _comando = ""; string CodSchedaVersNum = ""; - if (SteamWare.memLayer.ML.isInSessionObject("nextObjCommand")) + CodSchedaVersNum = string.Format("{0}.{1}.{2}", grView.SelectedDataKey["CodScheda"], grView.SelectedDataKey["Vers"], grView.SelectedDataKey["NumScheda"]); + if (CodSchedaVersNum != "") { - _comando = SteamWare.memLayer.ML.StringSessionObj("nextObjCommand"); - SteamWare.memLayer.ML.emptySessionVal("nextObjCommand"); - } - if (_comando != "") - { - CodSchedaVersNum = string.Format("{0}.{1}.{2}", grView.SelectedDataKey["CodScheda"], grView.SelectedDataKey["Vers"], grView.SelectedDataKey["NumScheda"]); - // SE c'era comando eseguo move... - switch (_comando) - { - case "moveUp": - case "moveDown": - DtProxy.man.taSCM.moveUpDown(_comando, Convert.ToInt32(idxDossier), CodSchedaVersNum); - break; - //case "clone": - // DtProxy.man.taDS.clone(memLayer.ML.QSS("CodSchedaVers"), grView.SelectedDataKey["CodMisura"].ToString()); - // break; - default: - break; - } - resetSelezione(); - } - else - { - raiseEvent(); + // mostro dettaglio.... } } protected void btnReset_Click(object sender, EventArgs e) @@ -114,38 +106,5 @@ namespace CMS_SC.WebUserControls grView.DataBind(); raiseEvent(); } - /// - /// determina visibilità frecce spostamento - /// - /// direzione: UP / DOWN - /// Ordinale - /// - public bool arrowVisible(object _direction, object _Ordinale) - { - bool answ = false; - string direction = _direction.ToString(); - int Ordinale = Convert.ToInt32(_Ordinale.ToString()); - switch (direction) - { - case "UP": - answ = Ordinale > 1; - break; - case "DOWN": - answ = Ordinale < DtProxy.man.taSCM.getByDossier(Convert.ToInt32(idxDossier)).Rows.Count; - break; - default: - break; - } - return answ; - } - /// - /// salvo in session il prox comando - /// - /// - /// - protected void lb_Click(object sender, EventArgs e) - { - SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument); - } } } \ No newline at end of file diff --git a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs index d055cd4..cddcf0f 100644 --- a/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs +++ b/CMS_SC/WebUserControls/mod_StatoCollaudi.ascx.designer.cs @@ -38,5 +38,14 @@ namespace CMS_SC.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.HiddenField hfIdxDossier; + + /// + /// hfFase control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.HiddenField hfFase; } } diff --git a/CMS_SC/bin/CMS-SC-Data.dll b/CMS_SC/bin/CMS-SC-Data.dll index f64d7d2..fef9594 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 c04a785..9bbfe8d 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 662fcaf..b27eb30 100644 Binary files a/CMS_SC/bin/SteamWare.dll and b/CMS_SC/bin/SteamWare.dll differ