diff --git a/Fuchs/Program.cs b/Fuchs/Program.cs index 6a5b321..1f109a5 100644 --- a/Fuchs/Program.cs +++ b/Fuchs/Program.cs @@ -40,7 +40,7 @@ public class Program FuchsOcmsIntranet.Initialize(builder.Configuration); // Initialize FdsConfig so FdsMfr / FdsMfrClient can resolve connection strings - fds.FdsConfig.Initialize(); + fds.FdsConfig.Initialize(builder.Configuration); // FDS MFR singleton — ILogger and ILoggerFactory are supplied by the ASP.NET Core DI container builder.Services.AddSingleton(); diff --git a/Fuchs/gulpfile.js b/Fuchs/gulpfile.js index acc4ff7..262547b 100644 --- a/Fuchs/gulpfile.js +++ b/Fuchs/gulpfile.js @@ -147,7 +147,7 @@ gulp.task("copy", async () => { const jobs = []; for (const cpy of copyconfig) { jobs.push( - pipeline(gulp.src(cpy.src, { allowEmpty: true }), gulp.dest(cpy.dest), preservetimeSafe()) + pipeline(gulp.src(cpy.src, { allowEmpty: true }), gulp.dest(cpy.dest), preservetimeSafe(), logSink("Copied: ")) ); } await Promise.all(jobs); diff --git a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.eot b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.eot index b93a495..b5aab37 100644 Binary files a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.eot and b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.eot differ diff --git a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.ttf b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.ttf index 1413fc6..8dab117 100644 Binary files a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.ttf and b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.ttf differ diff --git a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff index 9e61285..a078bce 100644 Binary files a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff and b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff differ diff --git a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff2 b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff2 index 64539b5..a631cf8 100644 Binary files a/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff2 and b/Fuchs/wwwroot/fts/glyphicons-halflings-regular.woff2 differ diff --git a/Fuchs/wwwroot/web/fis.bam.de.js b/Fuchs/wwwroot/web/fis.bam.de.js index 9d2cfdf..23b8969 100644 --- a/Fuchs/wwwroot/web/fis.bam.de.js +++ b/Fuchs/wwwroot/web/fis.bam.de.js @@ -36,8 +36,7 @@ let $bcol = { { name: 'EndToEndReference', label: 'Referenz', type: 'string' } ]), bsu: new fields_definition('Kontobericht', 'Kontoberichte', [ - // Accepts both MT940 (SWIFT text: .sta/.mt940/.txt) and CAMT (ISO 20022 XML: .xml/.camt). - { name: 'bsu', label: 'Export der Buchungen (MT940 oder CAMT)', type: 'file', required: true, prop: { multiple: true, accept: '.sta,.mt940,.txt,.xml,.camt,application/xml,text/xml,text/plain' } } + { name: 'bsu', label: 'Export der Buchungen', type: 'file', required: true, prop: { multiple: true } } ]) }; let gi = (n, c) => $$.sc(`glyphicon glyphicon-${n}`).aC(c); diff --git a/Fuchs_DataService/FdsShared.cs b/Fuchs_DataService/FdsShared.cs index 01ed91a..49a7cc0 100644 --- a/Fuchs_DataService/FdsShared.cs +++ b/Fuchs_DataService/FdsShared.cs @@ -26,6 +26,11 @@ public static class FdsConfig .Build(); } + public static void Initialize(IConfiguration configuration) + { + _config = configuration; + } + // -- Connection strings --------------------------------------------------- internal static string SQLConnectionString() => Current.GetConnectionString("fuchs_ConnectionString")