Finish v2.0.3(10)

salesbook.Maui/Core/Services/ManageDataService.cs

@@ -179,9 +179,9 @@ public class ManageDataService(
 
         activities = await localDb.Get<StbActivity>(x =>
             (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-            (whereCond.Start != null && whereCond.End != null && x.EffectiveDate == null &&
-             x.EstimatedDate >= whereCond.Start && x.EstimatedDate <= whereCond.End) ||
-            (x.EffectiveDate >= whereCond.Start && x.EffectiveDate <= whereCond.End) ||
+            (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
+             x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
+            (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
             (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
         );
 
@@ -223,9 +223,9 @@ public class ManageDataService(
         {
             activities = await localDb.Get<StbActivity>(x =>
                 (whereCond.ActivityId != null && x.ActivityId != null && whereCond.ActivityId.Equals(x.ActivityId)) ||
-                (whereCond.Start != null && whereCond.End != null && x.EffectiveDate == null &&
-                 x.EstimatedDate >= whereCond.Start && x.EstimatedDate <= whereCond.End) ||
-                (x.EffectiveDate >= whereCond.Start && x.EffectiveDate <= whereCond.End) ||
+                (whereCond.Start != null && whereCond.End != null && x.EffectiveTime == null &&
+                 x.EstimatedTime >= whereCond.Start && x.EstimatedTime <= whereCond.End) ||
+                (x.EffectiveTime >= whereCond.Start && x.EffectiveTime <= whereCond.End) ||
                 (whereCond.ActivityId == null && (whereCond.Start == null || whereCond.End == null))
             );
         }
@@ -309,19 +309,28 @@ public class ManageDataService(
     {
         return Task.Run(async () =>
         {
-            if (response.AnagClie != null)
+            try
             {
-                await localDb.InsertOrUpdate(response.AnagClie);
+                if (response.AnagClie != null)
+                {
+                    await localDb.InsertOrUpdate(response.AnagClie);
 
-                if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
-                if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                    if (response.VtbDest != null) await localDb.InsertOrUpdate(response.VtbDest);
+                    if (response.VtbCliePersRif != null) await localDb.InsertOrUpdate(response.VtbCliePersRif);
+                }
+
+                if (response.PtbPros != null)
+                {
+                    await localDb.InsertOrUpdate(response.PtbPros);
+
+                    if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                }
             }
-
-            if (response.PtbPros != null)
+            catch (Exception e)
             {
-                await localDb.InsertOrUpdate(response.PtbPros);
-
-                if (response.PtbProsRif != null) await localDb.InsertOrUpdate(response.PtbProsRif);
+                Console.WriteLine(e.Message);
+                SentrySdk.CaptureException(e);
+                throw;
             }
         });
     }

salesbook.Maui/salesbook.Maui.csproj

@@ -29,8 +29,8 @@
 		<ApplicationId>it.integry.salesbook</ApplicationId>
 
 		<!-- Versions -->
-		<ApplicationDisplayVersion>2.0.2</ApplicationDisplayVersion>
-		<ApplicationVersion>9</ApplicationVersion>
+		<ApplicationDisplayVersion>2.0.3</ApplicationDisplayVersion>
+		<ApplicationVersion>10</ApplicationVersion>
 
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<!--<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">

salesbook.Shared/Components/Pages/Calendar.razor

@@ -181,7 +181,7 @@
     private string _headerTitle = string.Empty;
     private readonly Dictionary<DateTime, List<ActivityDTO>> _eventsCache = new();
     private readonly Dictionary<DateTime, CategoryData[]> _categoriesCache = new();
-    private bool _isInitialized = false;
+    private bool _isInitialized;
 
     // Stato UI
     private bool Expanded { get; set; }
@@ -278,7 +278,7 @@
 
         // Raggruppa le attività per data
         var activitiesByDate = MonthActivities
-            .GroupBy(x => (x.EffectiveDate ?? x.EstimatedDate!).Value.Date)
+            .GroupBy(x => (x.EffectiveTime ?? x.EstimatedTime!).Value.Date)
             .ToDictionary(g => g.Key, g => g.ToList());
 
         foreach (var (date, activities) in activitiesByDate)
@@ -482,7 +482,7 @@
         var start = CurrentMonth;
         var end = start.AddDays(DaysInMonth - 1);
         var activities = await ManageData.GetActivity(new WhereCondActivity{Start = start, End = end});
-        MonthActivities = activities.OrderBy(x => x.EffectiveDate ?? x.EstimatedDate).ToList();
+        MonthActivities = activities.OrderBy(x => x.EffectiveTime ?? x.EstimatedTime).ToList();
 
         PrepareRenderingData();
         IsLoading = false;
@@ -574,7 +574,7 @@
             return;
         }
 
-        var date = activity.EffectiveDate ?? activity.EstimatedDate;
+        var date = activity.EffectiveTime ?? activity.EstimatedTime;
 
         if (CurrentMonth.Month != date!.Value.Month)
         {

salesbook.Shared/Components/Pages/PersonalInfo.razor

@@ -85,21 +85,21 @@
                        FullWidth="true"
                        StartIcon="@Icons.Material.Outlined.Sync"
                        Size="Size.Medium"
-                       OnClick="() => UpdateDb(true)"
+                       OnClick="() => UpdateDb()"
                        Variant="Variant.Outlined">
                 Sincronizza
             </MudButton>
 
-            <div class="divider"></div>
+            @* <div class="divider"></div> *@
 
-            <MudButton Class="button-settings red-icon"
+            @* <MudButton Class="button-settings red-icon"
                        FullWidth="true"
                        StartIcon="@Icons.Material.Outlined.Sync"
                        Size="Size.Medium"
                        OnClick="() => UpdateDb()"
                        Variant="Variant.Outlined">
                 Ripristina dati
-            </MudButton>
+            </MudButton> *@
         </div>
 
         <div class="container-button">

salesbook.Shared/Components/Pages/User.razor

@@ -425,7 +425,7 @@ else
         set
         {
             _filteredActivity = value;
-            StateHasChanged();
+            InvokeAsync(StateHasChanged);
         }
     }
 

salesbook.Shared/Components/SingleElements/Modal/ActivityForm.razor

@@ -41,7 +41,7 @@
 
                     @if (ActivityModel.CodJcom != null && SelectedComessa == null)
                     {
-                        <MudSkeleton />
+                        <MudSkeleton/>
                     }
                     else
                     {
@@ -100,7 +100,7 @@
 
                     @if (ActivityModel.UserName != null && SelectedUser == null)
                     {
-                        <MudSkeleton />
+                        <MudSkeleton/>
                     }
                     else
                     {
@@ -128,7 +128,7 @@
 
                     @if (ActivityType.IsNullOrEmpty())
                     {
-                        <MudSkeleton />
+                        <MudSkeleton/>
                     }
                     else
                     {
@@ -183,7 +183,7 @@
                 {
                     foreach (var file in ActivityFileList)
                     {
-                        <MudChip T="string" OnClick="() => OpenAttached(file.Id, file.FileName)" Color="Color.Default">
+                        <MudChip T="string" OnClick="() => OpenAttached(file.Id, file.FileName)" OnClose="() => DeleteAttach(file)" Color="Color.Default">
                             @file.FileName
                         </MudChip>
                     }
@@ -400,7 +400,25 @@
                 SelectedUser = Users.FindLast(x => x.UserName.Equals(ActivityModel.UserName));
 
             if (!IsNew && Id != null)
+            {
                 ActivityFileList = await IntegryApiService.GetActivityFile(Id);
+                if (ActivityModel.IdPosizione != null)
+                {
+                    ActivityModel.Position = await IntegryApiService.RetrievePosition(ActivityModel.IdPosizione.Value);
+                    CanAddPosition = false;
+
+                    AttachedList ??= [];
+                    AttachedList.Add(
+                        new AttachedDTO
+                        {
+                            Name = ActivityModel.Position.Description!,
+                            Lat = ActivityModel.Position.Lat,
+                            Lng = ActivityModel.Position.Lng,
+                            Type = AttachedDTO.TypeAttached.Position
+                        }
+                    );
+                }
+            }
 
             ActivityResult = await ManageData.GetTable<StbActivityResult>();
             Clienti = await ManageData.GetClienti(new WhereCondContact { FlagStato = "A" });
@@ -682,6 +700,33 @@
         }
     }
 
+    private async Task DeleteAttach(ActivityFileDto file)
+    {
+        Snackbar.Clear();
+
+        if (ActivityFileList == null) return;
+
+        try
+        {
+            ActivityFileList.Remove(file);
+            StateHasChanged();
+
+            await IntegryApiService.DeleteFile(ActivityModel.ActivityId!, file.FileName);
+        }
+        catch (Exception ex)
+        {
+            ActivityFileList.Add(file);
+            StateHasChanged();
+
+            Snackbar.Add("Impossibile eliminare il file", Severity.Error);
+            Console.WriteLine($"Impossibile eliminare il file: {ex.Message}");
+        }
+        finally
+        {
+            Snackbar.Add($"{file.FileName} eliminato con successo", Severity.Info);
+        }
+    }
+
     private async Task OpenAttached(AttachedDTO attached)
     {
         if (attached is { FileContent: not null, MimeType: not null })

salesbook.Shared/Components/SingleElements/Modal/AddAttached.razor

@@ -151,28 +151,31 @@
 
     private void OnNewName()
     {
-        switch (Attached.Type)
+        if (Attached != null)
         {
-            case AttachedDTO.TypeAttached.Position:
+            switch (Attached.Type)
             {
-                CanAddPosition = false;
+                case AttachedDTO.TypeAttached.Position:
+                {
+                    CanAddPosition = false;
 
-                Attached.Description = NewName!;
+                    Attached.Description = NewName!;
                     Attached.Name = NewName!;
 
-                break;
-            }
-            case AttachedDTO.TypeAttached.Image:
-            {
-                var extension = Path.GetExtension(Attached.Name);
-                Attached.Name = NewName! + extension;
+                    break;
+                }
+                case AttachedDTO.TypeAttached.Image:
+                {
+                    var extension = Path.GetExtension(Attached.Name);
+                    Attached.Name = NewName! + extension;
 
-                break;
+                    break;
+                }
+                case AttachedDTO.TypeAttached.Document:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
-            case AttachedDTO.TypeAttached.Document:
-                break;
-            default:
-                throw new ArgumentOutOfRangeException();
         }
 
         MudDialog.Close(Attached);

salesbook.Shared/Core/Dto/Activity/ActivityDTO.cs

@@ -34,7 +34,7 @@ public class ActivityDTO : StbActivity
                MinuteBefore == other.MinuteBefore &&
                NotificationDate == other.NotificationDate &&
                Category == other.Category &&
-               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedDate, other.EstimatedDate) && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveDate, other.EffectiveDate) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEnddate, other.EstimatedEnddate) && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEnddate, other.EffectiveEnddate) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
+               Complete == other.Complete && ActivityId == other.ActivityId && ActivityResultId == other.ActivityResultId && ActivityTypeId == other.ActivityTypeId && DataInsAct.Equals(other.DataInsAct) && ActivityDescription == other.ActivityDescription && ParentActivityId == other.ParentActivityId && TipoAnag == other.TipoAnag && CodAnag == other.CodAnag && CodJcom == other.CodJcom && CodJfas == other.CodJfas && Nullable.Equals(EstimatedTime, other.EstimatedTime) && Nullable.Equals(AlarmDate, other.AlarmDate) && Nullable.Equals(AlarmTime, other.AlarmTime) && Nullable.Equals(EffectiveTime, other.EffectiveTime) && ResultDescription == other.ResultDescription && Nullable.Equals(EstimatedEndtime, other.EstimatedEndtime) && Nullable.Equals(EffectiveEndtime, other.EffectiveEndtime) && UserCreator == other.UserCreator && UserName == other.UserName && Nullable.Equals(PercComp, other.PercComp) && Nullable.Equals(EstimatedHours, other.EstimatedHours) && CodMart == other.CodMart && PartitaMag == other.PartitaMag && Matricola == other.Matricola && Priorita == other.Priorita && Nullable.Equals(ActivityPlayCounter, other.ActivityPlayCounter) && ActivityEvent == other.ActivityEvent && Guarantee == other.Guarantee && Note == other.Note && Rfid == other.Rfid && IdLotto == other.IdLotto && PersonaRif == other.PersonaRif && HrNum == other.HrNum && Gestione == other.Gestione && Nullable.Equals(DataOrd, other.DataOrd) && NumOrd == other.NumOrd && IdStep == other.IdStep && IdRiga == other.IdRiga && Nullable.Equals(OraInsAct, other.OraInsAct) && IndiceGradimento == other.IndiceGradimento && NoteGradimento == other.NoteGradimento && FlagRisolto == other.FlagRisolto && FlagTipologia == other.FlagTipologia && OreRapportino == other.OreRapportino && UserModifier == other.UserModifier && Nullable.Equals(OraModAct, other.OraModAct) && Nullable.Equals(OraViewAct, other.OraViewAct) && CodVdes == other.CodVdes && CodCmac == other.CodCmac && WrikeId == other.WrikeId && CodMgrp == other.CodMgrp && PlanId == other.PlanId;
     }
 
     public override bool Equals(object? obj)
@@ -57,16 +57,12 @@ public class ActivityDTO : StbActivity
         hashCode.Add(CodAnag);
         hashCode.Add(CodJcom);
         hashCode.Add(CodJfas);
-        hashCode.Add(EstimatedDate);
         hashCode.Add(EstimatedTime);
         hashCode.Add(AlarmDate);
         hashCode.Add(AlarmTime);
-        hashCode.Add(EffectiveDate);
         hashCode.Add(EffectiveTime);
         hashCode.Add(ResultDescription);
-        hashCode.Add(EstimatedEnddate);
         hashCode.Add(EstimatedEndtime);
-        hashCode.Add(EffectiveEnddate);
         hashCode.Add(EffectiveEndtime);
         hashCode.Add(UserCreator);
         hashCode.Add(UserName);

salesbook.Shared/Core/Entity/PtbProsRif.cs

@@ -7,7 +7,7 @@ namespace salesbook.Shared.Core.Entity;
 public class PtbProsRif
 {
     [PrimaryKey, Column("composite_key")] 
-    public string CompositeKey { get; set; }
+    public string CompositeKey { get; set; } = null!;
 
     private string? _codPpro;
 

salesbook.Shared/Core/Entity/StbActivity.cs

@@ -36,9 +36,6 @@ public class StbActivity
     [Column("cod_jfas"), JsonPropertyName("codJfas")]
     public string? CodJfas { get; set; }
 
-    [Column("estimated_date"), JsonPropertyName("estimatedDate")]
-    public DateTime? EstimatedDate { get; set; }
-
     [Column("estimated_time"), JsonPropertyName("estimatedTime")]
     public DateTime? EstimatedTime { get; set; }
 
@@ -48,24 +45,15 @@ public class StbActivity
     [Column("alarm_time"), JsonPropertyName("alarmTime")]
     public DateTime? AlarmTime { get; set; }
 
-    [Column("effective_date"), JsonPropertyName("effectiveDate")]
-    public DateTime? EffectiveDate { get; set; }
-
     [Column("effective_time"), JsonPropertyName("effectiveTime")]
     public DateTime? EffectiveTime { get; set; }
 
     [Column("result_description"), JsonPropertyName("resultDescription")]
     public string? ResultDescription { get; set; }
 
-    [Column("estimated_enddate"), JsonPropertyName("estimatedEnddate")]
-    public DateTime? EstimatedEnddate { get; set; }
-
     [Column("estimated_endtime"), JsonPropertyName("estimatedEndtime")]
     public DateTime? EstimatedEndtime { get; set; }
 
-    [Column("effective_enddate"), JsonPropertyName("effectiveEnddate")]
-    public DateTime? EffectiveEnddate { get; set; }
-
     [Column("effective_endtime"), JsonPropertyName("effectiveEndtime")]
     public DateTime? EffectiveEndtime { get; set; }
 
@@ -173,4 +161,7 @@ public class StbActivity
 
     [Column("plan_id"), JsonPropertyName("planId")]
     public long? PlanId { get; set; }
+
+    [Column("id_posizione"), JsonPropertyName("idPosizione")]
+    public long? IdPosizione { get; set; }
 }

salesbook.Shared/Core/Interface/IntegryApi/IIntegryApiService.cs

@@ -25,6 +25,7 @@ public interface IIntegryApiService
     Task<CRMTransferProspectResponseDTO> TransferProspect(CRMTransferProspectRequestDTO request);
 
     Task UploadFile(string id, byte[] file, string fileName);
+    Task DeleteFile(string activityId, string fileName);
     Task<List<ActivityFileDto>> GetActivityFile(string activityId);
     Task<Stream> DownloadFile(string activityId, string fileName);
     Task<Stream> DownloadFileFromRefUuid(string refUuid, string fileName);
@@ -33,7 +34,7 @@ public interface IIntegryApiService
 
     //Position
     Task<PositionDTO> SavePosition(PositionDTO position);
-    Task<PositionDTO> RetrievePosition(string id);
+    Task<PositionDTO> RetrievePosition(long id);
 
     //Google
     Task<List<IndirizzoDTO>?> Geocode(string address);

salesbook.Shared/Core/Services/IntegryApiService.cs

@@ -134,7 +134,18 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
         fileContent.Headers.ContentType = MediaTypeHeaderValue.Parse("multipart/form-data");
         content.Add(fileContent, "files", fileName);
 
-        return integryApiRestClient.Post<object>($"uploadStbActivityFileAttachment", content, queryParams);
+        return integryApiRestClient.Post<object>("uploadStbActivityFileAttachment", content, queryParams);
+    }
+
+    public Task DeleteFile(string activityId, string fileName)
+    {
+        var queryParams = new Dictionary<string, object>
+        {
+            { "activityId", activityId },
+            { "fileName", fileName }
+        };
+
+        return integryApiRestClient.Get<object>("activity/removeAttachment", queryParams);
     }
 
     public Task<List<ActivityFileDto>> GetActivityFile(string activityId)
@@ -164,7 +175,7 @@ public class IntegryApiService(IIntegryApiRestClient integryApiRestClient, IUser
     public Task<PositionDTO> SavePosition(PositionDTO position) =>
         integryApiRestClient.Post<PositionDTO>("savePosition", position)!;
 
-    public Task<PositionDTO> RetrievePosition(string id)
+    public Task<PositionDTO> RetrievePosition(long id)
     {
         var queryParams = new Dictionary<string, object> { { "id", id } };