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

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-19 11:15:31 +02:00
parent dd18bcbbbb 2a79af77f2
commit f364b607b4
4 changed files with 9 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DB/SqlDataCompare_Vocab.dcmp
+2 -55
View File
@@ -6,61 +6,8 @@
<FullDisplayName>SQL2016DEV.Sauder_NKC (sa)</FullDisplayName>
</ConnectionProperties1>
<ConnectionProperties2>
<ConnectionString>Data Source=WIN2016-SQL\PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False</ConnectionString>
<FullDisplayName>WIN2016-SQL\PROD.Sauder_NKC_Prod (sa)</FullDisplayName>
<ConnectionString>Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC_Prod;Persist Security Info=True;User ID=sa;Pooling=False;MultipleActiveResultSets=False;Connect Timeout=60;Encrypt=False;TrustServerCertificate=False</ConnectionString>
<FullDisplayName>SQL2016PROD.Sauder_NKC_Prod (sa)</FullDisplayName>
</ConnectionProperties2>
<SessionSettings>Default</SessionSettings>
<DeselectedTable>[dbo].[AnagDevices]</DeselectedTable>
<DeselectedTable>[dbo].[AnagItemStatus]</DeselectedTable>
<DeselectedTable>[dbo].[AnagOpr]</DeselectedTable>
<DeselectedTable>[dbo].[BatchList]</DeselectedTable>
<DeselectedTable>[dbo].[BatchReqList_OLD]</DeselectedTable>
<DeselectedTable>[dbo].[BinList]</DeselectedTable>
<DeselectedTable>[dbo].[Bins]</DeselectedTable>
<DeselectedTable>[dbo].[Carts]</DeselectedTable>
<DeselectedTable>[dbo].[Clients]</DeselectedTable>
<DeselectedTable>[dbo].[Config]</DeselectedTable>
<DeselectedTable>[dbo].[ConfSetValues]</DeselectedTable>
<DeselectedTable>[dbo].[CountAssigned]</DeselectedTable>
<DeselectedTable>[dbo].[Counters]</DeselectedTable>
<DeselectedTable>[dbo].[DIRITTI]</DeselectedTable>
<DeselectedTable>[dbo].[ElencoPostazioni]</DeselectedTable>
<DeselectedTable>[dbo].[ErrorsLog]</DeselectedTable>
<DeselectedTable>[dbo].[FinalKit]</DeselectedTable>
<DeselectedTable>[dbo].[FUNZIONE]</DeselectedTable>
<DeselectedTable>[dbo].[Import_Log]</DeselectedTable>
<DeselectedTable>[dbo].[ItemEvents]</DeselectedTable>
<DeselectedTable>[dbo].[ItemList]</DeselectedTable>
<DeselectedTable>[dbo].[ItemValidation]</DeselectedTable>
<DeselectedTable>[dbo].[Kit2OtherItem]</DeselectedTable>
<DeselectedTable>[dbo].[KitList]</DeselectedTable>
<DeselectedTable>[dbo].[Lingue]</DeselectedTable>
<DeselectedTable>[dbo].[Materials]</DeselectedTable>
<DeselectedTable>[dbo].[MODULO]</DeselectedTable>
<DeselectedTable>[dbo].[Nesting]</DeselectedTable>
<DeselectedTable>[dbo].[OfflineOrderList]</DeselectedTable>
<DeselectedTable>[dbo].[OffOrd2Item]</DeselectedTable>
<DeselectedTable>[dbo].[Order2FinalKit]</DeselectedTable>
<DeselectedTable>[dbo].[OrderList]</DeselectedTable>
<DeselectedTable>[dbo].[OtherItemList]</DeselectedTable>
<DeselectedTable>[dbo].[Pack2Kit]</DeselectedTable>
<DeselectedTable>[dbo].[PackList]</DeselectedTable>
<DeselectedTable>[dbo].[PackListDet]</DeselectedTable>
<DeselectedTable>[dbo].[PackLog]</DeselectedTable>
<DeselectedTable>[dbo].[Permessi]</DeselectedTable>
<DeselectedTable>[dbo].[Permessi2Funzione]</DeselectedTable>
<DeselectedTable>[dbo].[Places]</DeselectedTable>
<DeselectedTable>[dbo].[PrintJobQueue]</DeselectedTable>
<DeselectedTable>[dbo].[Processes]</DeselectedTable>
<DeselectedTable>[dbo].[Remnants]</DeselectedTable>
<DeselectedTable>[dbo].[ReplOrders]</DeselectedTable>
<DeselectedTable>[dbo].[SheetList]</DeselectedTable>
<DeselectedTable>[dbo].[Stacklist]</DeselectedTable>
<DeselectedTable>[dbo].[TallyTable]</DeselectedTable>
<DeselectedTable>[dbo].[UTENTE]</DeselectedTable>
<DeselectedTable>[dbo].[Utenti]</DeselectedTable>
<DeselectedTable>[ext].[BatchKitting]</DeselectedTable>
<DeselectedTable>[ext].[BatchOrder]</DeselectedTable>
<DeselectedTable>[raw].[ItemList]</DeselectedTable>
<DeselectedTable>[raw].[OrderList]</DeselectedTable>
</DataComparison>
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=343']) {
withEnv(['NEXT_BUILD_NUMBER=344']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/Web.config
+5 -1
View File
@@ -93,8 +93,11 @@
</appSettings>
<connectionStrings>
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString"
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16"
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient"/>
<add name="ErrorLog"
connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;"
providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -425,6 +428,7 @@
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on remote access and securing ELMAH.
-->
<errorLog type="Elmah.SqlErrorLog, Elmah" connectionStringName="ErrorLog"/>
<security allowRemoteAccess="false"/>
</elmah>
<!--Autorizzaione di windows FORZATA solo sulla subdir SITE-->
NKC_WF/WebUserControls/cmp_batchDetail.ascx
+1 -1
View File
@@ -11,7 +11,7 @@
<div class="col-3">
<asp:LinkButton runat="server" ID="lbtSendEstim" CssClass="btn btn-sm btn-block btn-info" OnClick="lbtSendEstim_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmStartEstim") %>' Visible='<%# (checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Errors) || checkStatus(Eval("Status"), NKC_SDK.BatchStatus.Imported)) && canStartNew() %>'><%: traduci("SendToEstim") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtStopEstim" CssClass="btn btn-sm btn-block btn-dark" OnClick="lbtStopEstim_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmStopEstim") %>' Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationRequested) %>'><%: traduci("StopEstim") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSendNesting" CssClass="btn btn-sm btn-block btn-warning" OnClick="lbtSendNesting_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmStartNest") %>' Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && canStartNew() %>'>traduci("SendToNest")</asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtSendNesting" CssClass="btn btn-sm btn-block btn-warning" OnClick="lbtSendNesting_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmStartNest") %>' Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.EstimationDone) && canStartNew() %>'><%: traduci("SendToNest") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtStopNesting" CssClass="btn btn-sm btn-block btn-dark" OnClick="lbtStopNesting_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmStopNest") %>' Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestRequested) %>'><%: traduci("StopNest") %></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtAccept" CssClass="btn btn-sm btn-block btn-success" OnClick="lbtAccept_Click" OnClientClick='<%: SteamWare.jsUtils.getCBE("ConfirmAcceptNest") %>' Visible='<%# checkStatus(Eval("Status"), NKC_SDK.BatchStatus.NestDone) %>'><%: traduci("AcceptNest") %></asp:LinkButton>
</div>