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

Merge branch 'release/FixAttivaDisattivaOnlineUtente'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-02-02 16:27:02 +01:00
parent 2b335e2e81 52d63d12f0
commit 2f87e20267
8 changed files with 531 additions and 523 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GPW_Admin/GPW_Admin.csproj.user
+1 -1
View File
@@ -7,7 +7,7 @@
<IISExpressUseClassicPipelineMode>false</IISExpressUseClassicPipelineMode>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>C:\Users\samuele\source\repos\GPW\GPW_Admin\Properties\PublishProfiles\IIS03.pubxml</NameOfLastUsedPublishProfile>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Use64BitIISExpress />
<IISExpressSSLPort />
<UseGlobalApplicationHostFile />
GPW_Admin/WebUserControls/mod_adminDipendenti.ascx.cs
+4
View File
@@ -495,11 +495,15 @@ namespace GPW_Admin.WebUserControls
private static void fullRefresh()
{
licenzeGPW.resetLicenseData();
// eseguo call di recupero da online
bool refreshApp = licenzeGPW.RefreshAppInfo().Result;
bool refreshAct = licenzeGPW.RefreshActInfo().Result;
bool refreshPayload = licenzeGPW.RefreshPayload().Result;
//bool refreshLic = licenzeGPW.RefreshLicInfo().Result;
//if (refreshApp && refreshAct && refreshPayload)
//{
//}
}
private void fixVisibility()
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_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_Data/licenzeGPW.cs
+522 -511
View File
File diff suppressed because it is too large Load Diff
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>
HOME/Properties/PublishProfiles/IISDEV.pubxml
-7
View File
@@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>