diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5af36935..d9394d30 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -52,8 +52,8 @@ variables: if (($env:DEST -ne 'install')) { $srcFile="$env:APP_NAME/appsettings.Production-office.json" } - echo "Copy-Item -Path $srcFile -Destination $dstFile" - Copy-Item -Path $srcFile -Destination $dstFile + echo "Copy-Item -Path $srcFile -Destination $dstFile -force" + Copy-Item -Path $srcFile -Destination $dstFile -force echo "Completata copia file appsettings.json corretto" # helper creazione hash files x IIS diff --git a/MP.Prog/Components/CmpFooter.razor b/MP.Prog/Components/CmpFooter.razor index 23e14731..66537085 100644 --- a/MP.Prog/Components/CmpFooter.razor +++ b/MP.Prog/Components/CmpFooter.razor @@ -2,7 +2,7 @@
MP.Prog v.@version
-
+
@adesso Egalware
diff --git a/MP.Prog/Components/DataPager.razor b/MP.Prog/Components/DataPager.razor deleted file mode 100644 index 3d577d19..00000000 --- a/MP.Prog/Components/DataPager.razor +++ /dev/null @@ -1,56 +0,0 @@ -
-
-
-
- @if (totalCount > 0) - { -
    -
    • -
    • - @for (int i = @startPage; i <= endPage; ++i) - { - var pageNum = i; -
    • - } -
    • -
    • -
- } -
-
-
-
- @if (showLoading) - { -
-
-
- } -
-
-
-
-
-
- @if (!showLoading) - { - @totalCount records - } -
-
- @if (totalCount > 0) - { -
- -
- } -
-
-
-
\ No newline at end of file diff --git a/MP.Prog/Components/DataPager.razor.cs b/MP.Prog/Components/DataPager.razor.cs deleted file mode 100644 index c88f0745..00000000 --- a/MP.Prog/Components/DataPager.razor.cs +++ /dev/null @@ -1,189 +0,0 @@ -using Microsoft.AspNetCore.Components; -using System; -using System.Threading.Tasks; - -namespace MP.Prog.Components -{ - public partial class DataPager : ComponentBase - { - #region Protected Fields - - protected bool _showLoading = false; - - #endregion Protected Fields - - #region Private Properties - - private int endPage - { - get - { - int answ = (int)(currPage / numPages) * numPages + numPages; - answ = answ < LastPage ? answ : LastPage; - return answ; - } - } - - private int LastPage - { - get - { - return Math.Max((int)Math.Ceiling(totalCount / (double)PageSize), 1); - } - } - - private int nextBlock - { - get - { - int answ = currPage + numPages; - answ = answ < LastPage ? answ : LastPage; - return answ; - } - } - - private int numPages { get; set; } = 10; - - private int prevBlock - { - get - { - int answ = currPage - numPages; - answ = answ > 0 ? answ : 1; - return answ; - } - } - - // calcola un set 1 .. numPages centrato sulla pagina corrente... - private int startPage - { - get - { - int answ = (int)(currPage / numPages) * numPages; - answ = answ > 0 ? answ : 1; - return answ; - } - } - - #endregion Private Properties - - #region Protected Properties - - protected int _numPage { get; set; } = 1; - - protected int _numRecord { get; set; } = 10; - - protected int percLoading { get; set; } = 0; - - #endregion Protected Properties - - #region Public Properties - - [Parameter] - public int currPage - { - get - { - return _numPage; - } - set - { - bool doReport = !_numPage.Equals(value); - if (doReport) - { - _numPage = value; - reportChangePage(); - } - } - } - - [Parameter] - public EventCallback numPageChanged { get; set; } - - [Parameter] - public EventCallback numRecordChanged { get; set; } - - [Parameter] - public int PageSize - { - get - { - return _numRecord; - } - set - { - bool doReport = !_numRecord.Equals(value); - if (doReport) - { - _numRecord = value; - reportChange(); - } - } - } - - [Parameter] - public bool showLoading - { - get - { - return _showLoading; - } - set - { - if (value) - { - Random random = new Random(); - percLoading = random.Next(30, 90); - } - else - { - percLoading = 5; - } - _showLoading = value; - } - } - - [Parameter] - public int totalCount { get; set; } = 0; - - #endregion Public Properties - - #region Private Methods - - private void reportChange() - { - numRecordChanged.InvokeAsync(PageSize); - } - - private void reportChangePage() - { - numPageChanged.InvokeAsync(currPage); - } - - #endregion Private Methods - - #region Protected Methods - - protected string cssActive(int numPage) - { - string answ = ""; - if (numPage == currPage) - { - answ = "active"; - } - return answ; - } - - protected override async Task OnInitializedAsync() - { - await Task.Run(() => showLoading = false); - } - - protected void PaginationItemClick(int page) - { - currPage = page; - } - - #endregion Protected Methods - } -} \ No newline at end of file diff --git a/MP.Prog/Components/DiffView.razor b/MP.Prog/Components/DiffView.razor index 8ce387b6..3120bfdd 100644 --- a/MP.Prog/Components/DiffView.razor +++ b/MP.Prog/Components/DiffView.razor @@ -10,8 +10,8 @@
-
- +
+
@@ -22,7 +22,7 @@
-
+
@numChanges modifiche
diff --git a/MP.Prog/Components/FileEditor.razor b/MP.Prog/Components/FileEditor.razor index 1d7e286d..03f788a7 100644 --- a/MP.Prog/Components/FileEditor.razor +++ b/MP.Prog/Components/FileEditor.razor @@ -32,7 +32,7 @@
-
+
diff --git a/MP.Prog/Pages/Archive.razor b/MP.Prog/Pages/Archive.razor index 4efdb9ea..0eb25b9e 100644 --- a/MP.Prog/Pages/Archive.razor +++ b/MP.Prog/Pages/Archive.razor @@ -2,38 +2,25 @@ @using MP.Prog.Components -
+
-
-
-
-

Elenco Programmi

-
-
-
- -
-
+
+

Elenco Programmi

+
+
-
+
-
-
- -
-
-
+
-
- - - -
- @if (MacList != null) { foreach (var item in MacList) @@ -42,41 +29,37 @@ } } +
-
-
-
- - -
+
+ +
+ +
-
-
-
- - -
+
+
+ +
-
-
-
- - -
+
+
+ +
-
-
+
+
@if (!string.IsNullOrEmpty(SelFileName)) { @TextReduce(SelFileName, 20) }
-
+
Tags } - +
@record.LastMod.ToString("yyyy.MM.dd")
@record.LastMod.ToString("ddd HH:mm.ss")
@@ -202,7 +185,7 @@
}
-
- +
+
\ No newline at end of file diff --git a/MP.Prog/Pages/Index.razor b/MP.Prog/Pages/Index.razor index a2d9b822..fd997510 100644 --- a/MP.Prog/Pages/Index.razor +++ b/MP.Prog/Pages/Index.razor @@ -4,57 +4,53 @@ @using MP.Prog.Data @inject MessageService AppMService -
+
+
+
+

MAPO Prog

+
+ Gestione archivio programmi macchina per MES 4.0 +
+
+
+
+ | | +
+
+
+ powered by EgalWare +
+
+
+
+
+ +
+
-
-

MAPO Prog

-
- Gestione archivio programmi macchina per MES 4.0 -
-
-
-
- | | +
+
+
+
+ +
+
+

+ Sistema di gestione ed archiviazione storica dei programmi macchina CNC. +

+
-
-
-
-
-
-
-
- -
-
-
-

- Sistema di gestione ed archiviazione storica dei programmi macchina CNC. -

-
-
-
-
-
-
- powered by EgalWare -
-
-
-
-
-
- - @code +@code { - protected override void OnInitialized() - { - AppMService.ShowSearch = false; - AppMService.PageName = "Home"; - AppMService.PageIcon = "fas fa-home pr-2"; - } - } \ No newline at end of file + protected override void OnInitialized() + { + AppMService.ShowSearch = false; + AppMService.PageName = "Home"; + AppMService.PageIcon = "fas fa-home pr-2"; + } +} \ No newline at end of file diff --git a/MP.Prog/Pages/Setup.razor b/MP.Prog/Pages/Setup.razor index 1271ac63..e256d472 100644 --- a/MP.Prog/Pages/Setup.razor +++ b/MP.Prog/Pages/Setup.razor @@ -6,7 +6,7 @@ @inject MessageService AppMService -
+

Setup

diff --git a/MP.Prog/Shared/MainLayout.razor b/MP.Prog/Shared/MainLayout.razor index 98bd8d15..47bb1110 100644 --- a/MP.Prog/Shared/MainLayout.razor +++ b/MP.Prog/Shared/MainLayout.razor @@ -13,7 +13,7 @@
-
+
diff --git a/MP.Prog/Shared/NavMenu.razor b/MP.Prog/Shared/NavMenu.razor index 674a1cc9..99e8e3d9 100644 --- a/MP.Prog/Shared/NavMenu.razor +++ b/MP.Prog/Shared/NavMenu.razor @@ -1,4 +1,4 @@ -
+
MP.Prog