Merge branch 'develop'

This commit is contained in:
Samuele E. Locatelli
2020-03-25 17:33:40 +01:00
13 changed files with 79 additions and 76 deletions
+5
View File
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/css">
<include path="~/Content/MasterPage.css" />
<include path="~/Content/BuildBlocks.css" />
<include path="~/Content/ExtraComp.css" />
<include path="~/Content/BtnReport.css" />
<include path="~/Content/JQClock.css" />
<include path="~/Content/font.css" />
<include path="~/Content/Style.css" />
<include path="~/Content/StyleCustom.css" />
+3 -3
View File
@@ -1,13 +1,13 @@
@import url('MasterPage.css');
/*@import url('MasterPage.css');
@import url('BuildBlocks.css');
@import url('ExtraComp.css');
@import url('BtnReport.css');
@import url('JQClock.css');
@import url('font.css');
@import url('font.css');*/
/* Move down content because we have a fixed navbar that is 50px tall */
body {
/*font-family: 'Open Sans Condensed', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Roboto Condensed', sans-serif;*/
}
/* Wrapping element */
/* Set some basic padding to keep content from hitting the edges */
+3 -3
View File
@@ -1,14 +1,14 @@
@import url('MasterPage.css');
/*@import url('MasterPage.css');
@import url('BuildBlocks.css');
@import url('ExtraComp.css');
@import url('BtnReport.css');
@import url('JQClock.css');
@import url('font.css');
@import url('font.css');*/
/* Move down content because we have a fixed navbar that is 50px tall */
body {
/*font-family: 'Open Sans Condensed', sans-serif;*/
font-family: 'Roboto Condensed', sans-serif;
/*font-family: 'Roboto Condensed', sans-serif;*/
}
/* Wrapping element */
+1 -1
View File
@@ -1 +1 @@
@import url('MasterPage.css');@import url('BuildBlocks.css');@import url('ExtraComp.css');@import url('BtnReport.css');@import url('JQClock.css');@import url('font.css');body{font-family:'Roboto Condensed',sans-serif;}input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}
input,select,textarea{max-width:280px;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}input,select,textarea{max-width:100%;}}.elTimbSmart{padding:.2em;font-size:1.1em;line-height:1.3em;}.ui-input-btn input{opacity:.5;}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;}.logo{background-image:url(../images/logo_sw.png);-khtml-opacity:.5;-moz-opacity:.5;-ms-filter:"alpha(opacity=50)";filter:alpha(opacity=50);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=.5);opacity:.5;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.logo:hover{background-image:url(../images/logo_sw.png);-khtml-opacity:1;-moz-opacity:1;-ms-filter:"alpha(opacity=100)";filter:alpha(opacity=100);filter:progid:DXImageTransform.Microsoft.Alpha(opacity=1);opacity:1;width:800px;height:300px;margin:50px auto 50px auto;vertical-align:middle;background-repeat:no-repeat;}.bodyCenter{vertical-align:middle;text-align:center;height:100%;width:100%;}.centerMenu{background-color:#fff;text-align:center;border-width:thin;border-style:groove;border-color:#00f;}A:hover{color:#f00;}
+44 -44
View File
@@ -87,7 +87,7 @@
cursor: pointer;
position: relative;
margin: 2px 0 0 0;
padding: .5em .5em .5em .7em;
padding: 0.5em 0.5em 0.5em 0.7em;
font-size: 100%;
}
.ui-accordion .ui-accordion-content {
@@ -119,7 +119,7 @@
}
.ui-menu .ui-menu-item-wrapper {
position: relative;
padding: 3px 1em 3px .4em;
padding: 3px 1em 3px 0.4em;
}
.ui-menu .ui-menu-divider {
margin: 5px 0;
@@ -144,7 +144,7 @@
position: absolute;
top: 0;
bottom: 0;
left: .2em;
left: 0.2em;
margin: auto 0;
}
/* right-aligned */
@@ -153,11 +153,11 @@
right: 0;
}
.ui-button {
padding: .4em 1em;
padding: 0.4em 1em;
display: inline-block;
position: relative;
line-height: normal;
margin-right: .1em;
margin-right: 0.1em;
cursor: pointer;
vertical-align: middle;
text-align: center;
@@ -206,7 +206,7 @@ input.ui-button.ui-icon-notext .ui-icon {
height: auto;
text-indent: 0;
white-space: normal;
padding: .4em 1em;
padding: 0.4em 1em;
}
/* workarounds */
/* Support: Firefox 5 - 40 */
@@ -240,7 +240,7 @@ button.ui-button::-moz-focus-inner {
box-sizing: border-box;
}
.ui-controlgroup .ui-controlgroup-label {
padding: .4em 1em;
padding: 0.4em 1em;
}
.ui-controlgroup .ui-controlgroup-label span {
font-size: 80%;
@@ -261,14 +261,14 @@ button.ui-button::-moz-focus-inner {
.ui-controlgroup-vertical .ui-spinner-input {
/* Support: IE8 only, Android < 4.4 only */
width: 75%;
width: calc(97.6%);
width: calc(100% - 2.4em);
}
.ui-controlgroup-vertical .ui-spinner .ui-spinner-up {
border-top-style: solid;
}
.ui-checkboxradio-label .ui-icon-background {
box-shadow: inset 1px 1px 1px #ccc;
border-radius: .12em;
border-radius: 0.12em;
border: none;
}
.ui-checkboxradio-radio-label .ui-icon-background {
@@ -291,12 +291,12 @@ button.ui-button::-moz-focus-inner {
}
.ui-datepicker {
width: 17em;
padding: .2em .2em 0;
padding: 0.2em 0.2em 0;
display: none;
}
.ui-datepicker .ui-datepicker-header {
position: relative;
padding: .2em 0;
padding: 0.2em 0;
}
.ui-datepicker .ui-datepicker-prev,
.ui-datepicker .ui-datepicker-next {
@@ -345,12 +345,12 @@ button.ui-button::-moz-focus-inner {
}
.ui-datepicker table {
width: 100%;
font-size: .9em;
font-size: 0.9em;
border-collapse: collapse;
margin: 0 0 .4em;
margin: 0 0 0.4em;
}
.ui-datepicker th {
padding: .7em .3em;
padding: 0.7em 0.3em;
text-align: center;
font-weight: bold;
border: 0;
@@ -362,23 +362,23 @@ button.ui-button::-moz-focus-inner {
.ui-datepicker td span,
.ui-datepicker td a {
display: block;
padding: .2em;
padding: 0.2em;
text-align: right;
text-decoration: none;
}
.ui-datepicker .ui-datepicker-buttonpane {
background-image: none;
margin: .7em 0 0 0;
padding: 0 .2em;
margin: 0.7em 0 0 0;
padding: 0 0.2em;
border-left: 0;
border-right: 0;
border-bottom: 0;
}
.ui-datepicker .ui-datepicker-buttonpane button {
float: right;
margin: .5em .2em .4em;
margin: 0.5em 0.2em 0.4em;
cursor: pointer;
padding: .2em .6em .3em .6em;
padding: 0.2em 0.6em 0.3em 0.6em;
width: auto;
overflow: visible;
}
@@ -394,7 +394,7 @@ button.ui-button::-moz-focus-inner {
}
.ui-datepicker-multi .ui-datepicker-group table {
width: 95%;
margin: 0 auto .4em;
margin: 0 auto 0.4em;
}
.ui-datepicker-multi-2 .ui-datepicker-group {
width: 50%;
@@ -458,23 +458,23 @@ button.ui-button::-moz-focus-inner {
text-indent: -99999px;
overflow: hidden;
background-repeat: no-repeat;
left: .5em;
top: .3em;
left: 0.5em;
top: 0.3em;
}
.ui-dialog {
position: absolute;
top: 0;
left: 0;
padding: .2em;
padding: 0.2em;
outline: 0;
}
.ui-dialog .ui-dialog-titlebar {
padding: .4em 1em;
padding: 0.4em 1em;
position: relative;
}
.ui-dialog .ui-dialog-title {
float: left;
margin: .1em 0;
margin: 0.1em 0;
white-space: nowrap;
width: 90%;
overflow: hidden;
@@ -482,7 +482,7 @@ button.ui-button::-moz-focus-inner {
}
.ui-dialog .ui-dialog-titlebar-close {
position: absolute;
right: .3em;
right: 0.3em;
top: 50%;
width: 20px;
margin: -10px 0 0 0;
@@ -492,7 +492,7 @@ button.ui-button::-moz-focus-inner {
.ui-dialog .ui-dialog-content {
position: relative;
border: 0;
padding: .5em 1em;
padding: 0.5em 1em;
background: none;
overflow: auto;
}
@@ -500,14 +500,14 @@ button.ui-button::-moz-focus-inner {
text-align: left;
border-width: 1px 0 0 0;
background-image: none;
margin-top: .5em;
padding: .3em 1em .5em .4em;
margin-top: 0.5em;
padding: 0.3em 1em 0.5em 0.4em;
}
.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
float: right;
}
.ui-dialog .ui-dialog-buttonpane button {
margin: .5em .4em .5em 0;
margin: 0.5em 0.4em 0.5em 0;
cursor: pointer;
}
.ui-dialog .ui-resizable-n {
@@ -710,7 +710,7 @@ button.ui-button::-moz-focus-inner {
.ui-slider .ui-slider-range {
position: absolute;
z-index: 1;
font-size: .7em;
font-size: 0.7em;
display: block;
border: 0;
background-position: 0 0;
@@ -721,7 +721,7 @@ button.ui-button::-moz-focus-inner {
filter: inherit;
}
.ui-slider-horizontal {
height: .8em;
height: 0.8em;
}
.ui-slider-horizontal .ui-slider-handle {
top: -0.3em;
@@ -738,7 +738,7 @@ button.ui-button::-moz-focus-inner {
right: 0;
}
.ui-slider-vertical {
width: .8em;
width: 0.8em;
height: 100px;
}
.ui-slider-vertical .ui-slider-handle {
@@ -771,16 +771,16 @@ button.ui-button::-moz-focus-inner {
border: none;
background: none;
color: inherit;
padding: .222em 0;
margin: .2em 0;
padding: 0.222em 0;
margin: 0.2em 0;
vertical-align: middle;
margin-left: .4em;
margin-left: 0.4em;
margin-right: 2em;
}
.ui-spinner-button {
width: 1.6em;
height: 50%;
font-size: .5em;
font-size: 0.5em;
padding: 0;
margin: 0;
text-align: center;
@@ -805,25 +805,25 @@ button.ui-button::-moz-focus-inner {
.ui-tabs {
position: relative;
/* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
padding: .2em;
padding: 0.2em;
}
.ui-tabs .ui-tabs-nav {
margin: 0;
padding: .2em .2em 0;
padding: 0.2em 0.2em 0;
}
.ui-tabs .ui-tabs-nav li {
list-style: none;
float: left;
position: relative;
top: 0;
margin: 1px .2em 0 0;
margin: 1px 0.2em 0 0;
border-bottom-width: 0;
padding: 0;
white-space: nowrap;
}
.ui-tabs .ui-tabs-nav .ui-tabs-anchor {
float: left;
padding: .5em 1em;
padding: 0.5em 1em;
text-decoration: none;
}
.ui-tabs .ui-tabs-nav li.ui-tabs-active {
@@ -1006,7 +1006,7 @@ a.ui-button:active,
.ui-priority-secondary,
.ui-widget-content .ui-priority-secondary,
.ui-widget-header .ui-priority-secondary {
opacity: .7;
opacity: 0.7;
filter: alpha(opacity=70);
/* support: IE8 */
font-weight: normal;
@@ -1014,7 +1014,7 @@ a.ui-button:active,
.ui-state-disabled,
.ui-widget-content .ui-state-disabled,
.ui-widget-header .ui-state-disabled {
opacity: .35;
opacity: 0.35;
filter: alpha(opacity=35);
/* support: IE8 */
background-image: none;
@@ -1615,7 +1615,7 @@ a.ui-button:active,
/* Overlays */
.ui-widget-overlay {
background: #aaaaaa;
opacity: .3;
opacity: 0.3;
filter: alpha(opacity=30);
/* support: IE8 */
}
File diff suppressed because one or more lines are too long
+2
View File
@@ -832,8 +832,10 @@
</PropertyGroup>
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\BuildWebCompiler.1.12.394\build\BuildWebCompiler.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\BuildWebCompiler.1.12.394\build\BuildWebCompiler.targets'))" />
</Target>
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\BuildWebCompiler.1.12.394\build\BuildWebCompiler.targets" Condition="Exists('..\packages\BuildWebCompiler.1.12.394\build\BuildWebCompiler.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
@@ -21,8 +21,8 @@
<link rel="shortcut icon" href="~/images/favicon.png" type="image/png" />
<%--DA VERIFICARE QUESTI in inclusione...--%>
<link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
<link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />
<%-- <link href="~/Content/Style.css" rel="stylesheet" type="text/css" />
<link href="~/Content/StyleCustom.css" rel="stylesheet" type="text/css" />--%>
</head>
<body class="body">
<form id="form1" runat="server">
@@ -7,8 +7,8 @@
<% } %>
<div>
<div class="clearDiv dataBlock blockSpac divSx">
<div class="dataBlockHeader" style="height: 24px; text-align: center; margin: auto; font-size: 12pt;">
Gestione Mancate Timbrature
<div class="table-warning font-weight-bold text-center p-2" style="font-size: 1.2em;">
Mancate Timbrature
</div>
<div class="dataBlockReset" style="height: 24px; padding: 4px 0px 4px 0px;">
<div class="dataBlockSx">
@@ -60,12 +60,12 @@
</div>
</div>
<div class="clearDiv dataBlock blockSpac divSx">
<div class="dataBlockHeader" style="height: 24px; text-align: center; margin: auto; font-size: 12pt;">
<div class="table-primary font-weight-bold text-center p-2" style="font-size: 1.2em;">
Richieste in corso:
</div>
<asp:GridView ID="grViewRichieste" nome="grView" runat="server" AllowPaging="True" DataSourceID="odsRichieste" AutoGenerateColumns="False"
DataKeyNames="dataOra,idxDipendente" CellPadding="4" ForeColor="#333333" GridLines="None" Font-Size="Smaller" Width="100%"
OnRowUpdated="grView_RowUpdated" OnRowDeleted="grViewRichieste_RowDeleted">
OnRowUpdated="grView_RowUpdated" OnRowDeleted="grViewRichieste_RowDeleted" CssClass="table table-striped table-condensed table-sm small">
<AlternatingRowStyle BackColor="White" />
<EditRowStyle BackColor="#2461BF" />
<FooterStyle BackColor="#507CD1" Font-Bold="True" ForeColor="White" />
@@ -80,7 +80,8 @@
<Columns>
<asp:TemplateField HeaderText="dataOra" SortExpression="dataOra" ItemStyle-Wrap="false" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:Label ID="lblData" runat="server" Text='<%# Eval("dataOra", "{0:ddd yyyy.MM.dd, HH:mm}") %>' />
<asp:Label ID="lblData" runat="server" Text='<%# Eval("dataOra", "{0:dd/MM/yyyy}") %>' /><br />
<asp:Label ID="lblOra" runat="server" Text='<%# Eval("dataOra", "{0:ddd HH:mm}") %>' />
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderText="IN" ItemStyle-HorizontalAlign="Center">
@@ -106,7 +107,7 @@
</asp:TemplateField>
<asp:TemplateField>
<ItemTemplate>
<div style="padding: 10px; text-align: right;">
<div>
<asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CommandArgument="Elimina" CommandName="Delete" CssClass="btn btn-danger btn-sm"><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
</div>
</ItemTemplate>
@@ -5,23 +5,23 @@
<link href="~/css/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<div class="clearDiv dataBlock blockSpac divSx">
<div class="dataBlockHeader" style="height: 24px; text-align: center; margin: auto; font-size: 12pt;">
<div class="table-success font-weight-bold text-center p-2" style="font-size: 1.2em;">
Timbrature Approvate
</div>
<asp:GridView ID="grView" runat="server" DataSourceID="ods" AutoGenerateColumns="False" DataKeyNames="dataOra,idxDipendente"
CellPadding="4" ForeColor="#333333" GridLines="None" Font-Size="Smaller" Width="100%" OnRowDeleted="grView_RowDeleted"
OnRowUpdated="grView_RowUpdated">
<AlternatingRowStyle CssClass="alternatingRowStyle" />
CellPadding="4" GridLines="None" Font-Size="Smaller" Width="100%" OnRowDeleted="grView_RowDeleted"
OnRowUpdated="grView_RowUpdated" CssClass="table table-striped table-condensed table-sm small border-border-success">
<%--<AlternatingRowStyle CssClass="alternatingRowStyle" />
<HeaderStyle CssClass="table-success" />
<EditRowStyle CssClass="editRowStyle" />
<FooterStyle CssClass="footerStyle" ForeColor="White" />
<HeaderStyle CssClass="headerStyle" ForeColor="White" />
<PagerStyle CssClass="pagerStyle" ForeColor="White" />
<RowStyle CssClass="rowStyle" />
<SelectedRowStyle CssClass="selectedRowStyle" ForeColor="#333333" />
<SortedAscendingCellStyle CssClass="sortAscCell" />
<SortedAscendingHeaderStyle CssClass="sortAscHead" />
<SortedDescendingCellStyle CssClass="sortDescCell" />
<SortedDescendingHeaderStyle CssClass="sortDescHead" />
<SortedDescendingHeaderStyle CssClass="sortDescHead" />--%>
<EmptyDataTemplate>
<div style="background-color: #ACACAC;">
Nessun record TIMBRATURA
@@ -74,11 +74,9 @@
</asp:TemplateField>
<asp:TemplateField>
<ItemTemplate>
<div style="padding: 10px; text-align: right;">
<asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CommandArgument="Elimina" CommandName="Delete" CssClass="btn btn-danger btn-sm" Visible='<%# userCanDelete(Eval("Approv")) %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
<asp:ConfirmButtonExtender ID="cbeDelete" runat="server" ConfirmText="Sicuro di voler eliminare la timbratura? non è possibile annullare l'operazione."
TargetControlID="lbDelete"></asp:ConfirmButtonExtender>
</div>
<asp:LinkButton runat="server" ID="lbDelete" Text="Elimina" CommandArgument="Elimina" CommandName="Delete" CssClass="btn btn-danger btn-sm" Visible='<%# userCanDelete(Eval("Approv")) %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
<asp:ConfirmButtonExtender ID="cbeDelete" runat="server" ConfirmText="Sicuro di voler eliminare la timbratura? non è possibile annullare l'operazione."
TargetControlID="lbDelete"></asp:ConfirmButtonExtender>
</ItemTemplate>
</asp:TemplateField>
</Columns>
-4
View File
@@ -1,8 +1,4 @@
[
{
"outputFile": "Content/Site.css",
"inputFile": "Content/Site.less"
},
{
"outputFile": "Content/Style.css",
"inputFile": "Content/Style.less"
+1
View File
@@ -6,6 +6,7 @@
<package id="AspNet.ScriptManager.bootstrap" version="4.4.1" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net462" />
<package id="bootstrap" version="4.4.1" targetFramework="net462" />
<package id="BuildWebCompiler" version="1.12.394" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.2.0" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="card my-1">
<div class="card-header">
<b>Gestione mancate timbrature</b>
<b>Mancate timbrature</b>
</div>
<div class="card-body p-2">
<div class="row">