Egalware/GPW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/FixQrCodeDisplay'

Browse Source
This commit is contained in:
Samuele Locatelli
2021-11-13 09:21:36 +01:00
parent 7a2b176ce4 9aeca04f93
commit 274edd0789
20 changed files with 95 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DotfuscatorGpwAdm.xml
-7
View File
@@ -26,13 +26,6 @@
<option>transformxaml</option>
<file dir="${configdir}\GPW_Admin\bin" name="SteamWare.dll" />
</inputassembly>
<inputassembly refid="c2fc219b-44ad-4901-af2c-26515b886f8a">
<option>honoroas</option>
<option>stripoa</option>
<option>library</option>
<option>transformxaml</option>
<file dir="${configdir}\GPW_Admin\obj\Release" name="GPW_Admin.dll" />
</inputassembly>
</asmlist>
</input>
<output>
GPW_Admin/Bundle.config
+11 -11
View File
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8" ?>
<bundles version="1.0">
<styleBundle path="~/Content/fonts">
<include path="~/Content/font.css" />
<include path="~/Content/font-awesome.css" />
</styleBundle>
<styleBundle path="~/Content/css">
<include path="~/Content/BtnReport.css" />
<include path="~/Content/Site.css" />
</styleBundle>
<styleBundle path="~/Content/fonts">
<include path="~/Content/font.css" />
<include path="~/Content/font-awesome.css" />
</styleBundle>
<styleBundle path="~/Content/css">
<include path="~/Content/BtnReport.css" />
<include path="~/Content/Site.css" />
</styleBundle>
<styleBundle path="~/Content/bootstrap">
<include path="~/Content/bootstrap.css" />
</styleBundle>
<styleBundle path="~/Content/bootstrap">
<include path="~/Content/bootstrap.css" />
</styleBundle>
</bundles>
GPW_Admin/Content/Roboto.woff2
BIN
View File
Binary file not shown.
GPW_Admin/Content/RobotoCondensed.woff2
BIN
View File
Binary file not shown.
GPW_Admin/Content/RobotoCondensedExt.woff2
BIN
View File
Binary file not shown.
GPW_Admin/Content/RobotoExt.woff2
BIN
View File
Binary file not shown.
GPW_Admin/Content/font.css
+12 -2
View File
@@ -2,23 +2,33 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
font-weight: 400;
font-display: swap;
src: url('OpenSansCondensed.woff') format('woff');
}
/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
/*src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');*/
src: url('Roboto.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* latin */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
font-weight: 400;
font-display: swap;
/*src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2');*/
src: url('RobotoCondensed.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
GPW_Admin/Content/font.less
+12 -2
View File
@@ -2,26 +2,36 @@
font-family: 'Open Sans';
font-style: normal;
font-weight: 400;
font-display: swap;
src: url('OpenSans.woff') format('woff');
}
@font-face {
font-family: 'Open Sans Condensed';
font-style: normal;
font-weight: 300;
font-weight: 400;
font-display: swap;
src: url('OpenSansCondensed.woff') format('woff');
}
/* latin */
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
font-display: swap;
/*src: url(https://fonts.gstatic.com/s/roboto/v29/KFOmCnqEu92Fr1Mu4mxK.woff2) format('woff2');*/
src: url('Roboto.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
/* latin */
@font-face {
font-family: 'Roboto Condensed';
font-style: normal;
font-weight: 300;
font-weight: 400;
font-display: swap;
/*src: url(https://fonts.gstatic.com/s/robotocondensed/v19/ieVl2ZhZI2eCN5jzbjEETS9weq8-19K7DQ.woff2) format('woff2');*/
src: url('RobotoCondensed.woff2') format('woff2');
unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
}
GPW_Admin/Content/font.min.css
Vendored
+1 -1
View File
@@ -1 +1 @@
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:300;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;src:url('Roboto.woff2') format('woff2');}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:300;src:url('RobotoCondensed.woff2') format('woff2');}
@font-face{font-family:'Open Sans';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSans.woff') format('woff');}@font-face{font-family:'Open Sans Condensed';font-style:normal;font-weight:400;font-display:swap;src:url('OpenSansCondensed.woff') format('woff');}@font-face{font-family:'Roboto';font-style:normal;font-weight:400;font-display:swap;src:url('Roboto.woff2') format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;}@font-face{font-family:'Roboto Condensed';font-style:normal;font-weight:400;font-display:swap;src:url('RobotoCondensed.woff2') format('woff2');unicode-range:U+0-FF,U+131,U+152-153,U+2BB-2BC,U+2C6,U+2DA,U+2DC,U+2000-206F,U+2074,U+20AC,U+2122,U+2191,U+2193,U+2212,U+2215,U+FEFF,U+FFFD;}
GPW_Admin/GPW_Admin.csproj
+2
View File
@@ -557,6 +557,8 @@
<Content Include="Content\bootstrap-reboot.css.map" />
<Content Include="Content\bootstrap-grid.min.css.map" />
<Content Include="Content\bootstrap-grid.css.map" />
<Content Include="Content\RobotoCondensedExt.woff2" />
<Content Include="Content\RobotoExt.woff2" />
<None Include="Properties\PublishProfiles\IISDEV.pubxml" />
<Content Include="Scripts\bootstrap.min.js.map" />
<Content Include="Scripts\bootstrap.js.map" />
GPW_Admin/GPW_Admin.csproj.user
+1 -1
View File
@@ -7,7 +7,7 @@
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
GPW_Admin/Web.config
+14 -14
View File
@@ -77,14 +77,14 @@
<add key="maxRefreshToReload" value="30" />
<!--Gestione Barcode-->
<!--<add key="secTimeoutBCode" value="8" />
<add key="prefComandi" value="CMD" />
<add key="prefIdx" value="idx" />
<add key="prefMatr" value="matr" />
<add key="prefCF" value="cf" />
<add key="entrata" value="CMDIN" />
<add key="uscita" value="CMDOUT" />
<add key="ipv4StazBCode" value="*" />
<add key="showNameAfterCmd" value="true" />-->
<add key="prefComandi" value="CMD" />
<add key="prefIdx" value="idx" />
<add key="prefMatr" value="matr" />
<add key="prefCF" value="cf" />
<add key="entrata" value="CMDIN" />
<add key="uscita" value="CMDOUT" />
<add key="ipv4StazBCode" value="*" />
<add key="showNameAfterCmd" value="true" />-->
<!--ricerca autocomplete-->
<add key="maxNumSuggest" value="30" />
<!--Logging-->
@@ -418,14 +418,14 @@
<add name="Session" type="Microsoft.AspNet.SessionState.SessionStateModuleAsync, Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" preCondition="integratedMode" />
</modules>
<staticContent>
<remove fileExtension=".woff" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<remove fileExtension=".woff2" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff" />
<remove fileExtension=".svg" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
<remove fileExtension=".json" />
<remove fileExtension=".svg" />
<remove fileExtension=".woff" />
<remove fileExtension=".woff2" />
<mimeMap fileExtension=".json" mimeType="application/json" />
<mimeMap fileExtension=".svg" mimeType="image/svg+xml" />
<mimeMap fileExtension=".woff" mimeType="application/x-font-woff" />
<mimeMap fileExtension=".woff2" mimeType="application/x-font-woff2" />
</staticContent>
</system.webServer>
<elmah>
GPW_Admin/WebUserControls/cmp_userCard.ascx
+19 -14
View File
@@ -1,29 +1,34 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_userCard.ascx.cs" Inherits="GPW_Admin.WebUserControls.cmp_userCard" %>
<div class="row textCondens">
<div class="row">
<asp:HiddenField runat="server" ID="hfShowExt" />
<asp:Repeater runat="server" ID="repUserCards" DataSourceID="ods">
<ItemTemplate>
<div class="col-md-6 my-4">
<div class="row">
<div class="col-3">
<div class="col-md-3 my-4">
<div class="card">
<div class="card-header bg-light p-1">
<asp:Image runat="server" CssClass="img-fluid" ID="imgQR" ImageUrl='<%# getImgUrl(Eval("idxDipendente"),Eval("authKey")) %>' />
</div>
<div class="col-9">
<div class="card-body">
<div class="row">
<div class="col-12">
<div class="col-12" style="font-size: 3em;">
<b><%# Eval("Cognome") %> </b>
</div>
<div class="col-12 textCondens" style="font-size: 2.2em;">
<%# Eval("Nome") %>
</div>
</div>
</div>
<div class="card-footer">
<div class="d-flex justify-content-between">
<div class="px-1">
<div class="img-fluid">
<img src="./images/LogoSteamware.png" height="64" />
</div>
</div>
</div>
<div class="row">
<div class="col-12 textCondens" style="font-size: 3em;">
<b><%# Eval("Cognome") %> </b>
<%# Eval("Nome") %>
</div>
<div class="col-6">
<i>SMART Access Link</i>
<div class="px-1 text-right pt-3">
<br />
<i>SMART a-link</i>
</div>
</div>
</div>
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx
+18 -26
View File
@@ -25,7 +25,7 @@
</div>
</div>
<div class="p-2">
<asp:CheckBox runat="server" ID="chkshowAll" Text="Mostra tutti" OnCheckedChanged="chkshowAll_CheckedChanged" AutoPostBack="true" ToolTip="Mostra tutti gli utenti (anche cessati/inattivi)" Checked="true" />
<asp:CheckBox runat="server" ID="chkshowAll" Text="Mostra tutti" OnCheckedChanged="chkshowAll_CheckedChanged" AutoPostBack="true" ToolTip="Mostra tutti gli utenti (anche cessati/inattivi)" Checked="false" />
</div>
</div>
<div class="small">
@@ -183,19 +183,25 @@
<FooterTemplate>
<div class="d-flex">
<div class="px-2">
<asp:TextBox ID="txtluogoNascita" runat="server" Text='<%# Bind("luogoNascita") %>' Width="8em" />
</div>
<div class="px-2 text-right">
<asp:TextBox ID="txtprovNascita" runat="server" Text='<%# Bind("provNascita") %>' Width="2em" />
</div>
<div class="px-2 text-right">
<asp:TextBox ID="txtnazNascita" runat="server" Text='<%# Bind("nazNascita") %>' Width="2em" />
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-map-marker" aria-hidden="true"></i></span>
</div>
<asp:TextBox ID="txtluogoNascita" CssClass="form-control" runat="server" Text='<%# Bind("luogoNascita") %>' Width="12em" ToolTip="luogo nascita" />
<asp:TextBox ID="txtprovNascita" CssClass="form-control" runat="server" Text='<%# Bind("provNascita") %>' Width="3em" ToolTip="provincia nascita" />
<asp:TextBox ID="txtnazNascita" CssClass="form-control" runat="server" Text='<%# Bind("nazNascita") %>' Width="3em" ToolTip="nazione nascita" />
</div>
</div>
</div>
<div class="d-flex">
<div class="px-2 text-right">
<asp:TextBox ID="txtdataNascita" runat="server" Text='<%# Bind("dataNascita","{0:yyyy/MM/dd}") %>' Width="8em" />
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataNascita" TargetControlID="txtdataNascita" Format="yyyy/MM/dd" />
<div class="input-group input-group-sm">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-calendar" aria-hidden="true"></i></span>
</div>
<asp:TextBox ID="txtdataNascita" CssClass="form-control" runat="server" Text='<%# Bind("dataNascita","{0:yyyy/MM/dd}") %>' Width="8em" />
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataNascita" TargetControlID="txtdataNascita" Format="yyyy/MM/dd" />
</div>
</div>
</div>
</FooterTemplate>
@@ -248,20 +254,6 @@
</EditItemTemplate>
<FooterTemplate>
<asp:CheckBox ID="chkattivo" runat="server" Checked='<%# Bind("attivo") %>' Enabled="false" />
<div class="d-flex">
<div class="px-2 text-right">
<asp:TextBox ID="txtdataAssunzione" runat="server" Text='<%# Bind("dataAssunzione","{0:yyyy/MM/dd}") %>' Width="8em" />
<sub>assunzione</sub>
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataAssunzione" TargetControlID="txtdataAssunzione" Format="yyyy/MM/dd" />
</div>
</div>
<div class="d-flex">
<div class="px-2 text-right">
<asp:TextBox ID="txtdataCessazione" runat="server" Text='<%# Bind("dataCessazione","{0:yyyy/MM/dd}") %>' Width="8em" />
<sub>cessazione</sub>
<asp:CalendarExtender runat="server" FirstDayOfWeek="Monday" ID="ceDataCessazione" TargetControlID="txtdataCessazione" Format="yyyy/MM/dd" />
</div>
</div>
</FooterTemplate>
</asp:TemplateField>
<asp:TemplateField ShowHeader="False">
@@ -272,8 +264,8 @@
<asp:LinkButton runat="server" ID="lbtDelete" CssClass="btn btn-sm btn-danger" CausesValidation="False" CommandArgument='<%# Eval("idxDipendente") %>' CommandName="Delete" ToolTip='<%# traduci("Delete") %>' Visible='<%# delEnabled(Eval("idxDipendente")) %>'><i class="fa fa-trash" aria-hidden="true"></i></asp:LinkButton>
<asp:ConfirmButtonExtender ID="cbeDelete" runat="server" ConfirmText='<%# traduci("confermaDel")%>' TargetControlID="lbtDelete"></asp:ConfirmButtonExtender>
</ItemTemplate>
<EditItemTemplate>
</EditItemTemplate>
<EditItemTemplate></EditItemTemplate>
<FooterTemplate></FooterTemplate>
<ItemStyle HorizontalAlign="Center" />
</asp:TemplateField>
</Columns>
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
+1 -1
View File
@@ -94,7 +94,7 @@ namespace GPW_Admin.WebUserControls
grView.FooterRow.Visible = true;
}
// sollevo evento nuovo valore...
raiseAddNew();
//raiseAddNew();
}
/// <summary>
GPW_Barcode/GPW_Barcode.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
GPW_Barcode/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
BIN
View File
Binary file not shown.
GPW_Commesse/GPW_Commesse.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<Use64BitIISExpress />
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
GPW_Smart/GPW_Smart.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>
HOME/HOME.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
</PropertyGroup>
<ProjectExtensions>
<VisualStudio>