Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix turni x schermo sinoa 7"

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-03-13 17:09:32 +01:00
parent 1c67d6d48d
commit 3af4a344f0
10 changed files with 111 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP-Tablet/Content/baseStyle.css
+5
View File
@@ -65,6 +65,11 @@ body .ui-overlay-c {
width: 70%;
}
}
@media (max-width: 600px) {
.modal-dialog.modal-dialog-slideout {
width: 65%;
}
}
.modal-dialog-slideout {
min-height: 100%;
margin: 0 auto 0 0;
MP-Tablet/Content/baseStyle.less
+6
View File
@@ -74,6 +74,12 @@ body {
}
}
@media (max-width: 600px) {
.modal-dialog.modal-dialog-slideout {
width: 65%
}
}
.modal-dialog-slideout {
min-height: 100%;
margin: 0 auto 0 0;
MP-Tablet/Content/baseStyle.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);min-width:8em;}.rCAll{border-radius:10px;}.rCTop{border-radius:10px 10px 0 0;}.rCBot{border-radius:0 0 10px 10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-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;}@media(max-width:576px){.modal-dialog.modal-dialog-slideout{width:70%;}}.modal-dialog-slideout{min-height:100%;margin:0 auto 0 0;background:#fff;}.modal.fade .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(-100%,0);transform:translate(-100%,0);}.modal.fade.show .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(0,0);transform:translate(0,0);flex-flow:column;}.modal-dialog-slideout .modal-content{border:0;}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.divSx{float:left;padding:0;margin:0;}.divDx{float:right;padding:0;margin:0;}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto;}.clearDiv{clear:both;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}
body{font-family:'Open Sans',sans-serif;color:#fff;background-image:linear-gradient(#444,#222);}body .ui-body-a,body .ui-body-c,body .ui-overlay-c{text-shadow:0 0 0;}.bodyDark{color:#fff;background-image:linear-gradient(#444,#222);}.bg-black{color:#fff;background-image:linear-gradient(#111,#000);}.titleBlock{font-family:'Open Sans Condensed',sans-serif;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.mapBlock{font-family:'Open Sans Condensed',sans-serif;color:#fff;background-image:linear-gradient(#111,#000);box-shadow:15px 15px 20px 0 rgba(150,150,150,.2),10px 10px 20px 0 rgba(200,200,200,.39);min-width:8em;}.rCAll{border-radius:10px;}.rCTop{border-radius:10px 10px 0 0;}.rCBot{border-radius:0 0 10px 10px;}.labelTopDx{padding:.1em .4em;width:auto;min-height:0;top:0;left:auto;bottom:auto;color:#c0c0c0;background:#909;background:rgba(153,0,153,.8);-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;}@media(max-width:576px){.modal-dialog.modal-dialog-slideout{width:70%;}}@media(max-width:600px){.modal-dialog.modal-dialog-slideout{width:65%;}}.modal-dialog-slideout{min-height:100%;margin:0 auto 0 0;background:#fff;}.modal.fade .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(-100%,0);transform:translate(-100%,0);}.modal.fade.show .modal-dialog.modal-dialog-slideout{-webkit-transform:translate(0,0);transform:translate(0,0);flex-flow:column;}.modal-dialog-slideout .modal-content{border:0;}.switch{position:relative;display:inline-block;width:60px;height:34px;}.switch input{display:none;}.slider{position:absolute;cursor:pointer;top:0;left:0;right:0;bottom:0;background-color:#ccc;-webkit-transition:.4s;transition:.4s;}.slider:before{position:absolute;content:"";height:26px;width:26px;left:4px;bottom:4px;background-color:#fff;-webkit-transition:.4s;transition:.4s;}input:checked+.slider{background-color:#2196f3;}input:focus+.slider{box-shadow:0 0 1px #2196f3;}input:checked+.slider:before{-webkit-transform:translateX(26px);-ms-transform:translateX(26px);transform:translateX(26px);}.slider.round{border-radius:34px;}.slider.round:before{border-radius:50%;}.divSx{float:left;padding:0;margin:0;}.divDx{float:right;padding:0;margin:0;}.divCenter{float:none;text-align:center;padding:0;margin:0 auto 0 auto;}.clearDiv{clear:both;}.stdFont{color:#000;text-shadow:0 0 0 #111;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}.rowStyle{background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f1f1f1));background-image:-webkit-linear-gradient(#fff,#f1f1f1);background-image:-moz-linear-gradient(#fff,#f1f1f1);background-image:-ms-linear-gradient(#fff,#f1f1f1);background-image:-o-linear-gradient(#fff,#f1f1f1);background-image:linear-gradient(#fff,#f1f1f1);border:1px solid #cdcdcd;}.alternatingRowStyle{border:1px solid #cdcdcd;background-image:-webkit-gradient(linear,left top,left bottom,from(#ddf),to(#e1f1ff));background-image:-webkit-linear-gradient(#ddf,#e1f1ff);background-image:-moz-linear-gradient(#ddf,#e1f1ff);background-image:-ms-linear-gradient(#ddf,#e1f1ff);background-image:-o-linear-gradient(#ddf,#e1f1ff);background-image:linear-gradient(#ddf,#e1f1ff);}.sVe{text-align:left;background:#009036;background:rgba(0,255,80,.6);color:#ff0;}.sGi{text-align:left;background:#ffec00;background:rgba(255,220,0,.6);}.sRo{text-align:left;background-color:#e2001a;background:rgba(240,0,10,.6);}.sBl{text-align:left;background:#3690ff;background:rgba(0,80,255,.6);color:#ff0;}.sGr{text-align:left;background-color:#bcbcbc;background:rgba(180,180,180,.6);}
MP-Tablet/Content/bootstrap/_variables.scss
+2 -2
View File
@@ -166,7 +166,7 @@ $paragraph-margin-bottom: 1rem !default;
$grid-breakpoints: (
xs: 0,
sm: 600px,
sm: 601px,
md: 768px,
lg: 992px,
xl: 1200px
@@ -181,7 +181,7 @@ $grid-breakpoints: (
// Define the maximum width of `.container` for different screen sizes.
$container-max-widths: (
sm: 564px,
sm: 565px,
md: 720px,
lg: 960px,
xl: 1140px
MP-Tablet/Content/bootstrap/bootstrap.css
Vendored
+18 -18
View File
@@ -27,7 +27,7 @@
--light: #f8f9fa;
--dark: #343a40;
--breakpoint-xs: 0;
--breakpoint-sm: 600px;
--breakpoint-sm: 601px;
--breakpoint-md: 768px;
--breakpoint-lg: 992px;
--breakpoint-xl: 1200px;
@@ -456,9 +456,9 @@ pre {
padding-left: 15px;
margin-right: auto;
margin-left: auto; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.container {
max-width: 564px; } }
max-width: 565px; } }
@media (min-width: 768px) {
.container {
max-width: 720px; } }
@@ -638,7 +638,7 @@ pre {
.offset-11 {
margin-left: 91.66667%; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.col-sm {
flex-basis: 0;
flex-grow: 1;
@@ -1198,7 +1198,7 @@ pre {
.table-dark.table-hover tbody tr:hover {
background-color: rgba(255, 255, 255, 0.075); }
@media (max-width: 599.98px) {
@media (max-width: 600.98px) {
.table-responsive-sm {
display: block;
width: 100%;
@@ -1565,7 +1565,7 @@ select.form-control-lg:not([size]):not([multiple]), .input-group-lg > select.for
align-items: center; }
.form-inline .form-check {
width: 100%; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.form-inline label {
display: flex;
align-items: center;
@@ -2720,13 +2720,13 @@ tbody.collapse.show {
background: no-repeat center center;
background-size: 100% 100%; }
@media (max-width: 599.98px) {
@media (max-width: 600.98px) {
.navbar-expand-sm > .container,
.navbar-expand-sm > .container-fluid {
padding-right: 0;
padding-left: 0; } }
@media (min-width: 600px) {
@media (min-width: 601px) {
.navbar-expand-sm {
flex-flow: row nowrap;
justify-content: flex-start; }
@@ -3035,7 +3035,7 @@ tbody.collapse.show {
flex-direction: column; }
.card-deck .card {
margin-bottom: 15px; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.card-deck {
flex-flow: row wrap;
margin-right: -15px;
@@ -3053,7 +3053,7 @@ tbody.collapse.show {
flex-direction: column; }
.card-group > .card {
margin-bottom: 15px; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.card-group {
flex-flow: row wrap; }
.card-group > .card {
@@ -3101,7 +3101,7 @@ tbody.collapse.show {
.card-columns .card {
margin-bottom: 0.75rem; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.card-columns {
column-count: 3;
column-gap: 1.25rem; }
@@ -3300,7 +3300,7 @@ tbody.collapse.show {
margin-bottom: 2rem;
background-color: #e9ecef;
border-radius: 0.3rem; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.jumbotron {
padding: 4rem 2rem; } }
@@ -3701,7 +3701,7 @@ button.close {
height: 50px;
overflow: scroll; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.modal-dialog {
max-width: 500px;
margin: 1.75rem auto; }
@@ -4268,7 +4268,7 @@ button.bg-dark:focus {
.d-inline-flex {
display: inline-flex !important; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.d-sm-none {
display: none !important; }
.d-sm-inline {
@@ -4489,7 +4489,7 @@ button.bg-dark:focus {
.align-self-stretch {
align-self: stretch !important; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.flex-sm-row {
flex-direction: row !important; }
.flex-sm-column {
@@ -4738,7 +4738,7 @@ button.bg-dark:focus {
.float-none {
float: none !important; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.float-sm-left {
float: left !important; }
.float-sm-right {
@@ -5102,7 +5102,7 @@ button.bg-dark:focus {
.mx-auto {
margin-left: auto !important; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.m-sm-0 {
margin: 0 !important; }
.mt-sm-0,
@@ -5858,7 +5858,7 @@ button.bg-dark:focus {
.text-center {
text-align: center !important; }
@media (min-width: 600px) {
@media (min-width: 601px) {
.text-sm-left {
text-align: left !important; }
.text-sm-right {
MP-Tablet/Content/bootstrap/bootstrap.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
MP-Tablet/Turni.aspx
+3 -3
View File
@@ -13,11 +13,11 @@
<div class="row">
<div class="col-12 col-sm-6 col-md-8">
<uc1:mod_dettMacchina ID="mod_dettMacchina1" runat="server" />
<div class="row my-2">
<div class="col-12 col-md-7">
<div class="row my-2 textCondens">
<div class="col-6">
<uc2:mod_turni ID="mod_turni1" runat="server" />
</div>
<div class="col-12 col-md-5 text-center">
<div class="col-6 text-center">
<uc1:mod_dettTurni runat="server" ID="mod_dettTurni" />
</div>
</div>
MP-Tablet/WebUserControls/mod_dettTurni.ascx
+40 -42
View File
@@ -1,44 +1,42 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_dettTurni.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_dettTurni" %>
<div style="width: 9em;">
<div>
<b>Turni Attivi</b>
<asp:DetailsView ID="dtView" runat="server" DataSourceID="odsTurni" AutoGenerateRows="False" DataKeyNames="IdxMacchina" Width="100%">
<Fields>
<asp:TemplateField HeaderText="T1">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T1")) %>'>
<asp:Label ID="Label1" in="lblT1" runat="server" Text="Turno 1" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="T2">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T2")) %>'>
<asp:Label ID="lblT2" in="lblT2" runat="server" Text="Turno 2" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="T3">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T3")) %>'>
<asp:Label ID="lblT3" in="lblT3" runat="server" Text="Turno 3" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
</Fields>
</asp:DetailsView>
<asp:ObjectDataSource ID="odsTurni" runat="server" SelectMethod="getByIdxMacc" TypeName="MapoDb.DS_ProdTempiTableAdapters.TurniMacchinaTableAdapter">
<SelectParameters>
<asp:SessionParameter Name="IdxMacchina" SessionField="idxMacchina" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div>
<div class="sVe">
Turno Aperto
</div>
<div class="sGr">
Turno Chiuso
</div>
</div>
<div>
<b>Turni Attivi</b>
<asp:DetailsView ID="dtView" runat="server" DataSourceID="odsTurni" AutoGenerateRows="False" DataKeyNames="IdxMacchina" Width="100%" BorderStyle="None" GridLines="Vertical">
<Fields>
<asp:TemplateField HeaderText="T1">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T1")) %>'>
<asp:Label ID="Label1" in="lblT1" runat="server" Text="Turno 1" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="T2">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T2")) %>'>
<asp:Label ID="lblT2" in="lblT2" runat="server" Text="Turno 2" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="T3">
<ItemTemplate>
<asp:Panel runat="server" ID="pnlT1" CssClass='<%# coloreDaTurno(Eval("T3")) %>'>
<asp:Label ID="lblT3" in="lblT3" runat="server" Text="Turno 3" />
</asp:Panel>
</ItemTemplate>
</asp:TemplateField>
</Fields>
</asp:DetailsView>
<asp:ObjectDataSource ID="odsTurni" runat="server" SelectMethod="getByIdxMacc" TypeName="MapoDb.DS_ProdTempiTableAdapters.TurniMacchinaTableAdapter">
<SelectParameters>
<asp:SessionParameter Name="IdxMacchina" SessionField="idxMacchina" Type="String" />
</SelectParameters>
</asp:ObjectDataSource>
</div>
<div>
<div class="sVe px-2">
Turno Aperto
</div>
<div class="sGr px-2">
Turno Chiuso
</div>
</div>
MP-Tablet/WebUserControls/mod_dettTurni.ascx.cs
+29 -29
View File
@@ -2,35 +2,35 @@
namespace MoonProTablet.WebUserControls
{
public partial class mod_dettTurni : System.Web.UI.UserControl
public partial class mod_dettTurni : System.Web.UI.UserControl
{
protected void Page_Load(object sender, EventArgs e)
{
protected void Page_Load(object sender, EventArgs e)
{
updateTurni();
}
/// <summary>
/// aggiorna classi grafiche turni
/// </summary>
protected void updateTurni()
{
}
/// <summary>
/// fornisce classe CSS x colorare il turno secondo apertura o meno
/// </summary>
/// <param name="turno"></param>
/// <returns></returns>
public string coloreDaTurno(object turno)
{
string answ = "sGr";
bool aperto = false;
try
{
aperto = Convert.ToBoolean(turno);
}
catch
{ }
if (aperto) answ = "sVe";
return answ;
}
updateTurni();
}
/// <summary>
/// aggiorna classi grafiche turni
/// </summary>
protected void updateTurni()
{
}
/// <summary>
/// fornisce classe CSS x colorare il turno secondo apertura o meno
/// </summary>
/// <param name="turno"></param>
/// <returns></returns>
public string coloreDaTurno(object turno)
{
string answ = "sGr px-2";
bool aperto = false;
try
{
aperto = Convert.ToBoolean(turno);
}
catch
{ }
if (aperto) answ = "sVe px-2";
return answ;
}
}
}
MP-Tablet/WebUserControls/mod_turni.ascx
+6 -6
View File
@@ -1,8 +1,8 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="mod_turni.ascx.cs" Inherits="MoonProTablet.WebUserControls.mod_turni" %>
<div class="row">
<div class="col-6" style="text-align: right; padding-right: 10px; vertical-align: middle;">
<h3>Turno 1:</h3>
<div class="col-6" style="text-align: right; padding-right: 1rem; vertical-align: middle;">
<b>Turno 1:</b>
</div>
<div class="col-6 dropdown-menu1">
<label class="switch">
@@ -10,8 +10,8 @@
<span class="slider round"></span>
</label>
</div>
<div class="col-6" style="text-align: right; padding-right: 10px; vertical-align: middle;">
<h3>Turno 2:</h3>
<div class="col-6" style="text-align: right; padding-right: 1rem; vertical-align: middle;">
<b>Turno 2:</b>
</div>
<div class="col-6">
<label class="switch">
@@ -19,8 +19,8 @@
<span class="slider round"></span>
</label>
</div>
<div class="col-6" style="text-align: right; padding-right: 10px; vertical-align: middle;">
<h3>Turno 3:</h3>
<div class="col-6" style="text-align: right; padding-right: 1rem; vertical-align: middle;">
<b>Turno 3:</b>
</div>
<div class="col-6">
<label class="switch">