Group by issue in responses

fixed region issue
added survey start and end date validation
2024-01-22 12:17:34 -05:00 · 2024-01-18 11:44:13 -05:00 · 2023-12-13 17:11:51 -05:00 · 2023-12-12 17:13:44 -05:00 · 2023-12-12 13:40:27 -05:00 · 2023-12-04 14:52:24 -05:00
72 changed files with 335 additions and 993 deletions
--- a/DamageAssesmentApi/.dockerignore
+++ b/DamageAssesmentApi/.dockerignore
@ -1,25 +0,0 @@
-**/.classpath
-**/.dockerignore
-**/.env
-**/.git
-**/.gitignore
-**/.project
-**/.settings
-**/.toolstarget
-**/.vs
-**/.vscode
-**/*.*proj.user
-**/*.dbmdl
-**/*.jfm
-**/azds.yaml
-**/bin
-**/charts
-**/docker-compose*
-**/Dockerfile*
-**/node_modules
-**/npm-debug.log
-**/obj
-**/secrets.dev.yaml
-**/values.dev.yaml
-LICENSE
-README.md
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj
@ -1,12 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -14,7 +12,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.9" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.9" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Db/Answer.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Db/Answer.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Answers.Db
 {
+    [Table("Answers")]
    public class Answer
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj", "DamageAssesment.Api.Answers/"]
-RUN dotnet restore "DamageAssesment.Api.Answers/DamageAssesment.Api.Answers.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Answers"
-RUN dotnet build "DamageAssesment.Api.Answers.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Answers.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Answers.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Answers": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5200"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:18005",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Answers": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5200",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Answers/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -16,7 +14,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.7" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/Attachment.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Db/Attachment.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Attachments.Db
 {
+    [Table("AnswerAttachments")]
    public class Attachment
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Dockerfile
@ -1,29 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj", "DamageAssesment.Api.Attachments/"]
-RUN dotnet restore "DamageAssesment.Api.Attachments/DamageAssesment.Api.Attachments.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Attachments"
-RUN dotnet build "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Attachments.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-# Create directories for attachments and set permissions
-RUN mkdir -p /app/DMS_Attachments/Active && \
-    mkdir -p /app/DMS_Attachments/Deleted && \
-    chown -R www-data:www-data /app/DMS_Attachments
-
-# Update appsettings.json with the correct paths for attachments
-RUN sed -i 's#"folderpath": "DMS_Attachments/Active"#"folderpath": "/app/DMS_Attachments/Active"#' appsettings.json && \
-    sed -i 's#"Deletepath": "DMS_Attachments/Deleted"#"Deletepath": "/app/DMS_Attachments/Deleted"#' appsettings.json
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Attachments.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Attachments": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5243"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:65305",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Attachments": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5243",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Attachments/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks.Test/DamageAssesment.Api.DocuLinks.Test.csproj
@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Controllers/DoculinkController.cs
@ -41,11 +41,11 @@ namespace DamageAssesment.Api.DocuLinks.Controllers
        /// <summary>
        /// Get a Doculink type by id.
        /// </summary>
+        [HttpGet]
        [Authorize(Roles = "admin")]
        [Route("doculinks/types/{id}")]
        [Route("doculinks/types/{id}/{language:alpha}")]
-        [HttpGet]
-        public async Task<IActionResult> GetLinkTypeAsync(int id,string? language)
+        public async Task<IActionResult> GetLinkTypeAsync(int id, string? language)
        {
            var result = await this.documentsProvider.GetLinkTypeAsync(id, language);
            if (result.IsSuccess)
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_1.txt
@ -1 +0,0 @@
-sample
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DASA_Documents/Active/Document_2.txt
@ -1 +0,0 @@
-sample
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj
@ -1,12 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">

  <PropertyGroup>
    <TargetFramework>net6.0</TargetFramework>
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -25,7 +23,6 @@
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/Doculink.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/Doculink.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("Doculinks")]
    public class Doculink
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkAttachments.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkAttachments.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;

 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkAttachments")]
    public class DoculinkAttachments
    {

--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkTranslation.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/DoculinkTranslation.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkTrans")]
    public class DoculinkTranslation
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/LinkType.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/LinkType.cs
@ -1,7 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkTypes")]
    public class LinkType
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/LinksTranslation.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Db/LinksTranslation.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;

 namespace DamageAssesment.Api.DocuLinks.Db
 {
+    [Table("DoculinkTypeTrans")]
    public class LinksTranslation
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Dockerfile
@ -1,30 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj", "DamageAssesment.Api.DocuLinks/"]
-RUN dotnet restore "DamageAssesment.Api.DocuLinks/DamageAssesment.Api.DocuLinks.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.DocuLinks"
-RUN dotnet build "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.DocuLinks.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-# Create directories for attachments and set permissions
-RUN mkdir -p /app/DASA_Documents/Active && \
-    mkdir -p /app/DASA_Documents/Deleted && \
-    chown -R www-data:www-data /app/DASA_Documents
-
-# Update appsettings.json with the correct paths for attachments
-RUN sed -i 's#"folderpath": "DASA_Documents/Active"#"folderpath": "/app/DASA_Documents/Active"#' appsettings.json && \
-    sed -i 's#"Deletepath": "DASA_Documents/Deleted"#"Deletepath": "/app/DASA_Documents/Deleted"#' appsettings.json
-
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.DocuLinks.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/Properties/launchSettings.json
@ -1,15 +1,23 @@
-{
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:60754",
+      "sslPort": 0
+    }
+  },
  "profiles": {
-    "DamageAssesment.Api.Doculinks": {
+    "DamageAssesment.Api.Questions": {
      "commandName": "Project",
+      "dotnetRunMessages": true,
      "launchBrowser": true,
      "launchUrl": "swagger",
      "applicationUrl": "http://localhost:5133",
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5136"
+      }
    },
    "IIS Express": {
      "commandName": "IISExpress",
@ -18,24 +26,6 @@
      "environmentVariables": {
        "ASPNETCORE_ENVIRONMENT": "Development"
      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:14425",
-      "sslPort": 0
    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.DocuLinks/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -14,7 +12,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Db/Employee.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Db/Employee.cs
@ -1,7 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Employees.Db
 {
+    [Table("Employees")]
    public class Employee
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj", "DamageAssesment.Api.Employees/"]
-RUN dotnet restore "DamageAssesment.Api.Employees/DamageAssesment.Api.Employees.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Employees"
-RUN dotnet build "DamageAssesment.Api.Employees.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Employees.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Employees.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Employees": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5135"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:14425",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Employees": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5135",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Employees/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -14,7 +12,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Location.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Location.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Locations.Db
 {
+    [Table("Locations")]
    public class Location
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Region.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Db/Region.cs
@ -1,7 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Locations.Db
 {
+    [Table("Regions")]
    public class Region
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj", "DamageAssesment.Api.Locations/"]
-RUN dotnet restore "DamageAssesment.Api.Locations/DamageAssesment.Api.Locations.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Locations"
-RUN dotnet build "DamageAssesment.Api.Locations.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Locations.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Locations.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Locations": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5213"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:20458",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Locations": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5213",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Locations/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Controllers/QuestionsController.cs
@ -1,6 +1,6 @@
 using DamageAssesment.Api.Questions.Interfaces;
-using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Authorization;
+using DamageAssesment.Api.Questions.Models;
 using Microsoft.AspNetCore.Mvc;

 namespace DamageAssesment.Api.Questions.Controllers
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -14,7 +12,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/CategoryTranslation.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/CategoryTranslation.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;

 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionCategoryTrans")]
    public class CategoryTranslation
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/Question.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/Question.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("Questions")]
    public class Question
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionCategory.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionCategory.cs
@ -1,8 +1,10 @@
 using System.Buffers.Text;
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionCategories")]
    public class QuestionCategory
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionType.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionType.cs
@ -1,7 +1,9 @@
 using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionTypes")]
    public class QuestionType
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionsTranslation.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Db/QuestionsTranslation.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Questions.Db
 {
+    [Table("QuestionTrans")]
    public class QuestionsTranslation
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj", "DamageAssesment.Api.Questions/"]
-RUN dotnet restore "DamageAssesment.Api.Questions/DamageAssesment.Api.Questions.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Questions"
-RUN dotnet build "DamageAssesment.Api.Questions.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Questions.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Questions.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Questions": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5133"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:60754",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Questions": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5133",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Questions/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -16,7 +14,6 @@
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
    <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Db/SurveyResponse.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;

 namespace DamageAssesment.Api.Responses.Db
 {
+    [Table("SurveyResponses")]
    public class SurveyResponse
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj", "DamageAssesment.Api.Responses/"]
-RUN dotnet restore "DamageAssesment.Api.Responses/DamageAssesment.Api.Responses.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Responses"
-RUN dotnet build "DamageAssesment.Api.Responses.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Responses.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Responses.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Models/SurveyQuestion.cs
@ -5,6 +5,7 @@
        public int CategoryId { get; set; }
        public string CategoryName { get; set; }
        public string CategoryImage { get; set; }
+        public object CategoryNames { get; set; }
        public List<Question> Questions { get; set; }
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Responses": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5104"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:58856",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Responses": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5104",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/Providers/SurveyResponsesProvider.cs
@ -82,7 +82,7 @@ namespace DamageAssesment.Api.Responses.Providers
                }
                listSurveyResponse = listSurveyResponse
               .OrderByDescending(obj => obj.Id)
-               .GroupBy(obj => new { obj.SurveyId, obj.EmployeeId, obj.LocationId })
+               .GroupBy(obj => new { obj.SurveyId,  obj.LocationId })//obj.EmployeeId,
               .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
               .ToList();
                if (listSurveyResponse.Any())
@ -582,6 +582,11 @@ namespace DamageAssesment.Api.Responses.Providers
                    surveyResonses = await surveyResponseDbContext.SurveyResponses.Where(x => x.SurveyId == surveyId && x.EmployeeId == employeeid).ToListAsync();
                    employee = await employeeServiceProvider.getEmployeeAsync(employeeid, token);
                }
+                surveyResonses = surveyResonses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//obj.EmployeeId,
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();

                var answers = await answerServiceProvider.getAnswersAsync(token);
                var questions = await questionServiceProvider.getQuestionsAsync(null, token);
@ -911,7 +916,11 @@ namespace DamageAssesment.Api.Responses.Providers
                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                    }
                }
-
+                surveyResonses = surveyResonses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId,  obj.LocationId }) //obj.EmployeeId,
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();
                var answers = await answerServiceProvider.getAnswersAsync(token);
                var questions = await questionServiceProvider.getQuestionsAsync(null,token);
                var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
@ -977,7 +986,11 @@ namespace DamageAssesment.Api.Responses.Providers
                        _employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
                    }
                }
-
+                surveyResponses = surveyResponses
+                .OrderByDescending(obj => obj.Id)
+                .GroupBy(obj => new { obj.SurveyId, obj.LocationId })//, obj.EmployeeId
+                .Select(group => group.FirstOrDefault())  // or .FirstOrDefault() if you want to handle empty groups
+                .ToList();
                //var surveyResponses = await surveyResponseDbContext.Responses.Where(x => x.SurveyId == survey.Id).ToListAsync();
                // var employees = await employeeServiceProvider.getEmployeesAsync();
                var answers = await answerServiceProvider.getAnswersAsync(token);
--- a/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Responses/appsettings.json
@ -6,26 +6,14 @@
    }
  },
  "AllowedHosts": "*",
-  "JwtSettings": {
-    "securitykey": "bWlhbWkgZGFkZSBzY2hvb2xzIHNlY3JldCBrZXk="
-  },
-  //"EndPointSettings": {
-  //  "AnswerUrlBase": "http://localhost:5200",
-  //  "LocationUrlBase": "http://localhost:5213",
-  //  "RegionUrlBase": "http://localhost:5211",
-  //  "QuestionUrlBase": "http://localhost:5133",
-  //  "EmployeeUrlBase": "http://localhost:5135",
-  //  "AttachmentUrlBase": "http://localhost:5243",
-  //  "SurveyUrlBase": "http://localhost:5009"
-  //},
-  //Endpoints for docker-container  
  "EndPointSettings": {
-    "AnswerUrlBase": "http://damageassesment.api.answers:80",
-    "LocationUrlBase": "http://damageassesment.api.locations:80",
-    "QuestionUrlBase": "http://damageassesment.api.questions:80",
-    "EmployeeUrlBase": "http://damageassesment.api.employees:80",
-    "AttachmentUrlBase": "http://damageassesment.api.attachments:80",
-    "SurveyUrlBase": "http://damageassesment.api.surveys:80"
+    "AnswerUrlBase": "http://localhost:5200",
+    "LocationUrlBase": "http://localhost:5213",
+    "RegionUrlBase": "http://localhost:5211",
+    "QuestionUrlBase": "http://localhost:5133",
+    "EmployeeUrlBase": "http://localhost:5135",
+    "AttachmentUrlBase": "http://localhost:5243",
+    "SurveyUrlBase": "http://localhost:5009"
  },
  "RessourceSettings": {
    "Employee": "/employees",
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj
@ -5,8 +5,6 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <GenerateDocumentationFile>True</GenerateDocumentationFile>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
  </PropertyGroup>

  <ItemGroup>
@ -14,7 +12,6 @@
    <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.21" />
    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.5" />
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.4" />
    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
  </ItemGroup>

--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveyTranslation.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Db/SurveyTranslation.cs
@ -3,6 +3,7 @@ using System.ComponentModel.DataAnnotations;

 namespace DamageAssesment.Api.Surveys.Db
 {
+    [Table("SurveyTrans")]
    public class SurveyTranslation
    {
        [Key]
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj", "DamageAssesment.Api.Surveys/"]
-RUN dotnet restore "DamageAssesment.Api.Surveys/DamageAssesment.Api.Surveys.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.Surveys"
-RUN dotnet build "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.Surveys.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.Surveys.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/Properties/launchSettings.json
@ -1,33 +1,4 @@
-{
-  "profiles": {
-    "DamageAssesment.Api.Surveys": {
-      "commandName": "Project",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      },
-      "dotnetRunMessages": true,
-      "applicationUrl": "http://localhost:5009"
-    },
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "swagger",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "Docker": {
-      "commandName": "Docker",
-      "launchBrowser": true,
-      "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/swagger",
-      "environmentVariables": {
-        "ASPNETCORE_URLS": "http://+:80"
-      },
-      "publishAllPorts": true
-    }
-  },
+{
  "$schema": "https://json.schemastore.org/launchsettings.json",
  "iisSettings": {
    "windowsAuthentication": false,
@ -36,5 +7,25 @@
      "applicationUrl": "http://localhost:51498",
      "sslPort": 0
    }
+  },
+  "profiles": {
+    "DamageAssesment.Api.Surveys": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "applicationUrl": "http://localhost:5009",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "swagger",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    }
  }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json
+++ b/DamageAssesmentApi/DamageAssesment.Api.Surveys/appsettings.Development.json
@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Dockerfile
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Dockerfile
@ -1,21 +0,0 @@
-#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
-WORKDIR /app
-EXPOSE 80
-
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
-WORKDIR /src
-COPY ["DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj", "DamageAssesment.Api.UsersAccess/"]
-RUN dotnet restore "DamageAssesment.Api.UsersAccess/DamageAssesment.Api.UsersAccess.csproj"
-COPY . .
-WORKDIR "/src/DamageAssesment.Api.UsersAccess"
-RUN dotnet build "DamageAssesment.Api.UsersAccess.csproj" -c Release -o /app/build
-
-FROM build AS publish
-RUN dotnet publish "DamageAssesment.Api.UsersAccess.csproj" -c Release -o /app/publish /p:UseAppHost=false
-
-FROM base AS final
-WORKDIR /app
-COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "DamageAssesment.Api.UsersAccess.dll"]
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IEmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IEmployeeServiceProvider.cs
@ -4,7 +4,7 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
    public interface IEmployeeServiceProvider
    {
-        Task<List<Employee>> getEmployeesAsync();
-        Task<Employee> getEmployeeAsync(int employeeId);
+        Task<List<Employee>> getEmployeesAsync(string token);
+        Task<Employee> getEmployeeAsync(int employeeId, string token);
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IHttpUtil.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IHttpUtil.cs
@ -4,6 +4,6 @@ using DamageAssesment.Api.UsersAccess.Models;
 { 
    public interface IHttpUtil
    {
-        Task<string> SendAsync(HttpMethod method, string url, string JsonInput);
+        Task<string> SendAsync(HttpMethod method, string url, string JsonInput, string token);
    }
 }
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Interfaces/IUsersAccessProvider.cs
@ -4,8 +4,8 @@ namespace DamageAssesment.Api.UsersAccess.Interfaces
 {
    public interface IUsersAccessProvider
    {
-       public Task<(bool IsSuccess, IEnumerable< Models.User> Users, string ErrorMessage)> GetUsersAsync();
-        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id);
+       public Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync();
+        public Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id);
        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PostUserAsync(Models.User User);
        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> PutUserAsync(int Id,Models.User User);
        public Task<(bool IsSuccess, Models.User User, string ErrorMessage)> DeleteUserAsync(int Id);
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Program.cs
@ -66,6 +66,7 @@ builder.Services.AddAuthorization(options =>

 var _jwtsettings = builder.Configuration.GetSection("JwtSettings");
 builder.Services.Configure<JwtSettings>(_jwtsettings);
+builder.Services.AddHttpContextAccessor();

 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Providers/UserAccessProvider.cs
@ -2,11 +2,13 @@
 using DamageAssesment.Api.UsersAccess.Db;
 using DamageAssesment.Api.UsersAccess.Interfaces;
 using DamageAssesment.Api.UsersAccess.Models;
+using Microsoft.AspNetCore.Http;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
 using Microsoft.IdentityModel.Tokens;
-using System.Data;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System.Data;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
@ -18,21 +20,23 @@ namespace DamageAssesment.Api.UsersAccess.Providers
        private readonly UsersAccessDbContext userAccessDbContext;
        private readonly ILogger<UsersAccessProvider> logger;
        private readonly IMapper mapper;
-        //private readonly IEmployeeServiceProvider employeeServiceProvider;
+        private readonly IEmployeeServiceProvider employeeServiceProvider;
        private readonly JwtSettings jwtSettings;
        private readonly ITokenServiceProvider tokenServiceProvider;
        private readonly IConfiguration configuration;
+        private readonly IHttpContextAccessor httpContextAccessor;

-        public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
+        public UsersAccessProvider(IConfiguration configuration,IOptions<JwtSettings> options, ITokenServiceProvider tokenServiceProvider, IHttpContextAccessor httpContextAccessor, UsersAccessDbContext userAccessDbContext, IEmployeeServiceProvider employeeServiceProvider, ILogger<UsersAccessProvider> logger, IMapper mapper)
        {
            this.userAccessDbContext = userAccessDbContext;
-            //this.employeeServiceProvider = employeeServiceProvider;
+            this.employeeServiceProvider = employeeServiceProvider;
            this.logger = logger;
            this.mapper = mapper;
            jwtSettings = options.Value;
            this.tokenServiceProvider = tokenServiceProvider;
+            this.httpContextAccessor = httpContextAccessor;
            this.configuration = configuration;
-            // seedData();
+            seedData();
        }

        public void seedData()
@ -55,18 +59,47 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                userAccessDbContext.SaveChanges();
            }
        }
-
-        public async Task<(bool IsSuccess, IEnumerable<Models.User> Users, string ErrorMessage)> GetUsersAsync()
+        private string GetToken()
+        {
+            string token = httpContextAccessor.HttpContext.Request.Headers.Authorization;
+            if (token != null)
+            {
+                token = token.Replace("Bearer ", string.Empty);
+            }
+            else
+            {
+                token = "";
+            }
+            return token;
+        }
+        public async Task<(bool IsSuccess, IEnumerable<object> Users, string ErrorMessage)> GetUsersAsync()
        {
            try
            {
                logger?.LogInformation("Gell all Users from DB");
                var users = await userAccessDbContext.Users.ToListAsync();
+                List<object> userslist= new List<object>();
                if (users != null)
                {
+                    var employees = await employeeServiceProvider.getEmployeesAsync( GetToken());
+                    var roles = await userAccessDbContext.Roles.ToListAsync();
+                    foreach (Db.User user in users)
+                    {
+                        var employee = employees.SingleOrDefault(a=>a.Id==user.EmployeeId);
+                        var role = roles.SingleOrDefault(s => s.Id == user.RoleId);
+                        userslist.Add(new
+                        {
+                            Id = user.Id,
+                            EmployeeId = user.EmployeeId,
+                            EmployeeCode = user.EmployeeCode,
+                            EmployeeName = (employee != null) ? employee.Name : null,
+                            RoleId = user.RoleId,
+                            RoleName = (role != null) ? role.Name : null
+                        });
+                    }
                    logger?.LogInformation($"{users.Count} Items(s) found");
-                    var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
-                    return (true, result, null);
+                   // var result = mapper.Map<IEnumerable<Db.User>, IEnumerable<Models.User>>(users);
+                    return (true, userslist, null);
                }
                return (false, null, "Not found");
            }
@ -76,18 +109,29 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                return (false, null, ex.Message);
            }
        }
-
-        public async Task<(bool IsSuccess, Models.User User, string ErrorMessage)> GetUsersAsync(int Id)
+        public async Task<(bool IsSuccess, object User, string ErrorMessage)> GetUsersAsync(int Id)
        {
            try
            {
                logger?.LogInformation("Querying Users table");
+                
                var user = await userAccessDbContext.Users.SingleOrDefaultAsync(s => s.Id == Id);
                if (user != null)
                {
+                    var employee = await employeeServiceProvider.getEmployeeAsync(user.EmployeeId,GetToken());
+                    var role = await userAccessDbContext.Roles.SingleOrDefaultAsync(s => s.Id == user.RoleId);
+                    var data = new
+                    {
+                        Id = user.Id,
+                        EmployeeId = user.EmployeeId,
+                        EmployeeCode=user.EmployeeCode,
+                        EmployeeName = (employee != null) ? employee.Name : null,
+                        RoleId = user.RoleId,
+                        RoleName = (role!=null)?role.Name:null
+                    };
                    logger?.LogInformation($"User Id: {Id} found");
                    var result = mapper.Map<Db.User, Models.User>(user);
-                    return (true, result, null);
+                    return (true, data, null);
                }
                return (false, null, "Not found");
            }
@ -190,35 +234,7 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                return (false, null, ex.Message);
            }
        }
-        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
-        {
-            try
-            {
-                var client = new HttpClient();
-                var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl"));
-                var collection = new List<KeyValuePair<string, string>>();
-                collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId")));
-                collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
-                collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope")));
-                collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type")));
-                collection.Add(new("username", username));
-                collection.Add(new("password", password));
-                var content = new FormUrlEncodedContent(collection);
-                request.Content = content;
-                var response = await client.SendAsync(request);
-                var responseString = await response.Content.ReadAsStringAsync();
-                if (response.IsSuccessStatusCode)
-                {
-                    return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
-                }
-                return (false, null, responseString);
-            }
-            catch (Exception ex)
-            {
-                return (false, null, ex.Message);
-            }

-        }
        public async Task<(bool IsSuccess, TokenResponse TokenResponse, string ErrorMessage)> AuthenticateAsync(string employecode)
        {
          
@ -270,6 +286,35 @@ namespace DamageAssesment.Api.UsersAccess.Providers
                  return (false, null, "Credentials are required to authenticate.");
              }
        }
+        public async Task<(bool IsSuccess, DadeSchoolToken TokenResponse, string ErrorMessage)> DadeSchoolAuthenticateAsync(string username, string password)
+        {
+            try
+            {
+                var client = new HttpClient();
+                var request = new HttpRequestMessage(HttpMethod.Post, configuration.GetValue<string>("Dadeschools:TokenUrl"));
+                var collection = new List<KeyValuePair<string, string>>();
+                collection.Add(new("client_id", configuration.GetValue<string>("Dadeschools:TokenClientId")));
+                collection.Add(new("client_secret", configuration.GetValue<string>("Dadeschools:TokenClientSecret")));
+                collection.Add(new("scope", configuration.GetValue<string>("Dadeschools:scope")));
+                collection.Add(new("grant_type", configuration.GetValue<string>("Dadeschools:grant_type")));
+                collection.Add(new("username", username));
+                collection.Add(new("password", password));
+                var content = new FormUrlEncodedContent(collection);
+                request.Content = content;
+                var response = await client.SendAsync(request);
+                var responseString = await response.Content.ReadAsStringAsync();
+                if (response.IsSuccessStatusCode)
+                {
+                    return (true, JsonConvert.DeserializeObject<DadeSchoolToken>(responseString), "");
+                }
+                return (false, null, responseString);
+            }
+            catch (Exception ex)
+            {
+                return (false, null, ex.Message);
+            }
+
+        }
        public async Task<(bool IsSuccess, IEnumerable<Models.Role> Roles, string ErrorMessage)> GetRolesAsync()
        {
            try
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/EmployeeServiceProvider.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/EmployeeServiceProvider.cs
@ -10,11 +10,11 @@ namespace DamageAssesment.Api.UsersAccess.Services
        {
        }

-        public async Task<List<Employee>> getEmployeesAsync()
+        public async Task<List<Employee>> getEmployeesAsync(string token)
        {
            try
            {
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                var employees = JsonConvert.DeserializeObject<List<Employee>>(responseJsonString);

                if (employees == null || !employees.Any())
@ -28,12 +28,12 @@ namespace DamageAssesment.Api.UsersAccess.Services
            }
        }

-        public async Task<Employee> getEmployeeAsync(int employeeId)
+        public async Task<Employee> getEmployeeAsync(int employeeId, string token)
        {
            try
            {
                url = urlBase + string.Format(configuration.GetValue<string>("RessourceSettings:EmployeeById"), employeeId);
-                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null);
+                var responseJsonString = await httpUtil.SendAsync(HttpMethod.Get, url, null,token);
                var employee = JsonConvert.DeserializeObject<Employee>(responseJsonString);

                if (employee == null)
--- a/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/HttpUtil.cs
+++ b/DamageAssesmentApi/DamageAssesment.Api.UsersAccess/Services/HttpUtil.cs
@ -14,7 +14,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
            this.httpClient = httpClient;
            this.logger = logger;
        }
-        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput)
+        public async Task<string> SendAsync(HttpMethod method, string url, string JsonInput,string token)
        {
            try
            {
@ -22,7 +22,7 @@ namespace DamageAssesment.Api.UsersAccess.Services
                request.Headers.Accept.Clear();
                request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));

-                //request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
+                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", token);
                if (method == HttpMethod.Post)
                {
                    request.Content = new StringContent(JsonInput, Encoding.UTF8, "application/json");
--- a/DamageAssesmentApi/DamageAssesment.sln
+++ b/DamageAssesmentApi/DamageAssesment.sln
@ -33,20 +33,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employe
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Employees.Test", "DamageAssesment.Api.Employees.Test\DamageAssesment.Api.Employees.Test.csproj", "{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks.Test", "DamageAssesment.Api.DocuLinks.Test\DamageAssesment.Api.DocuLinks.Test.csproj", "{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}"
 EndProject
-Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{0DD44934-6826-43C8-A438-320A05209967}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{26BFCF59-0D24-41C1-9202-D4FFCC52389B}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess", "DamageAssesment.Api.UsersAccess\DamageAssesment.Api.UsersAccess.csproj", "{40240AD6-90D2-4128-BCDF-12C77D1B1B55}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.UsersAccess.Test", "DamageAssesment.Api.UsersAccess.Test\DamageAssesment.Api.UsersAccess.Test.csproj", "{ADAF9385-262C-4A37-A603-A53B77EA515D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.DocuLinks", "DamageAssesment.Api.DocuLinks\DamageAssesment.Api.DocuLinks.csproj", "{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses", "DamageAssesment.Api.Responses\DamageAssesment.Api.Responses.csproj", "{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageAssesment.Api.Responses.Test", "DamageAssesment.Api.Responses.Test\DamageAssesment.Api.Responses.Test.csproj", "{22014966-BF3D-463A-B561-46635BE75C89}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -101,14 +99,22 @@ Global
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D6BF9AE9-72FA-4726-A326-35A35D27FFB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D356A3C9-B275-4B1A-9B1B-F48600E85E4F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A7F17ED7-71D2-4FD0-87E5-D83415078FC0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DD44934-6826-43C8-A438-320A05209967}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C7F1C88B-B3C1-406E-A741-1D9A07ED18C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26BFCF59-0D24-41C1-9202-D4FFCC52389B}.Release|Any CPU.Build.0 = Release|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{40240AD6-90D2-4128-BCDF-12C77D1B1B55}.Release|Any CPU.ActiveCfg = Release|Any CPU
@ -117,18 +123,6 @@ Global
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{ADAF9385-262C-4A37-A603-A53B77EA515D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B027FBB9-1357-4FD6-85B3-8ADCE11CAE05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B5C446DF-30DF-46E3-BD87-DA454C8B9C4F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22014966-BF3D-463A-B561-46635BE75C89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22014966-BF3D-463A-B561-46635BE75C89}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22014966-BF3D-463A-B561-46635BE75C89}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22014966-BF3D-463A-B561-46635BE75C89}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/DamageAssesmentApi/docker-compose.asf.yml
+++ b/DamageAssesmentApi/docker-compose.asf.yml
@ -1,80 +0,0 @@
-version: '3.4'
-
-services:
-  answers:
-    image: santhoshsnair/damageassesmentapianswers:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6001:80"
-
-  attachments:
-    image: santhoshsnair/damageassesmentapiattachments:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6002:80"
-
-
-  employees:
-    image: santhoshsnair/damageassesmentapiemployees:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6003:80"
-
-
-  locations:
-    image: santhoshsnair/damageassesmentapilocations:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6004:80"
-
-
-  questions:
-    image: santhoshsnair/damageassesmentapiquestions:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6005:80"
-
-
-  responses:
-    image: santhoshsnair/damageassesmentapisurveyresponses:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - services__Answers=http://10.0.0.4:19081/dasapp/answers/
-      - services__Locations=http://10.0.0.4:19081/dasapp/locations/
-      - services__Questions=http://10.0.0.4:19081/dasapp/questions/
-      - services__Employees=http://10.0.0.4:19081/dasapp/employees/
-      - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/
-      - services__Surveys=http://10.0.0.4:19081/dasapp/survey/
- 
-    ports:
-      - "6006:80"
-
-
-  surveys:
-    image: santhoshsnair/damageassesmentapisurveys:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6007:80"
-
-
-  doculinks:
-    image: santhoshsnair/damageassesmentapidoculinks:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6009:80"
-  sqlserver:
-    image: mcr.microsoft.com/mssql/server:2019-latest
-    environment:
-      - SA_PASSWORD=your_password
-      - ACCEPT_EULA=Y
-    ports:
-      - "1433:1433"
-    volumes:
-      - ./sql_data:/var/opt/mssql/data
--- a/DamageAssesmentApi/docker-compose.dcproj
+++ b/DamageAssesmentApi/docker-compose.dcproj
@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk">
-  <PropertyGroup Label="Globals">
-    <ProjectVersion>2.1</ProjectVersion>
-    <DockerTargetOS>Linux</DockerTargetOS>
-    <ProjectGuid>0dd44934-6826-43c8-a438-320a05209967</ProjectGuid>
-    <DockerLaunchAction>LaunchBrowser</DockerLaunchAction>
-    <DockerServiceUrl>{Scheme}://localhost:{ServicePort}/swagger</DockerServiceUrl>
-    <DockerServiceName>damageassesment.api.answers</DockerServiceName>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="docker-compose.sql.yml" />
-    <None Include="docker-compose.asf.yml" />
-    <None Include="docker-compose.override.yml">
-      <DependentUpon>docker-compose.yml</DependentUpon>
-    </None>
-    <None Include="docker-compose.yml" />
-    <None Include=".dockerignore" />
-  </ItemGroup>
-</Project>
--- a/DamageAssesmentApi/docker-compose.override.yml
+++ b/DamageAssesmentApi/docker-compose.override.yml
@ -1,74 +0,0 @@
-version: '3.4'
-
-services:
-  damageassesment.api.answers:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6001:80"
-
-  damageassesment.api.attachments:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6002:80"
-
-
-  damageassesment.api.employees:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6003:80"
-
-
-  damageassesment.api.locations:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6004:80"
-
-
-  damageassesment.api.questions:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6005:80"
-
-
-  damageassesment.api.responses:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - services__Answers=http://damageassesment.api.answers:80
-      - services__Locations=http://damageassesment.api.locations:80
-      - services__Questions=http://damageassesment.api.questions:80
-      - services__Employees=http://damageassesment.api.employees:80
-      - services__Attachments=http://damageassesment.api.attachments:80
-      - services__Surveys=http://damageassesment.api.survey:80
- 
-    ports:
-      - "6006:80"
-
-
-  damageassesment.api.surveys:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6007:80"
-
- 
-  damageassesment.api.usersaccess:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6008:80"
-
-  damageassesment.api.doculinks:
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6009:80"
-
-  
-
-
-
--- a/DamageAssesmentApi/docker-compose.sql.yml
+++ b/DamageAssesmentApi/docker-compose.sql.yml
@ -1,78 +0,0 @@
-version: '3.4'
-
-services:
-  answers:
-    image: santhoshsnair/damageassesmentapianswers:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6001:80"
-
-  attachments:
-    image: santhoshsnair/damageassesmentapiattachments:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6002:80"
-
-
-  employees:
-    image: santhoshsnair/damageassesmentapiemployees:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6003:80"
-
-
-  locations:
-    image: santhoshsnair/damageassesmentapilocations:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6004:80"
-
-
-  questions:
-    image: santhoshsnair/damageassesmentapiquestions:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6005:80"
-
-
-  responses:
-    image: santhoshsnair/damageassesmentapisurveyresponses:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-      - services__Answers=http://10.0.0.4:19081/dasapp/answers/
-      - services__Locations=http://10.0.0.4:19081/dasapp/locations/
-      - services__Questions=http://10.0.0.4:19081/dasapp/questions/
-      - services__Employees=http://10.0.0.4:19081/dasapp/employees/
-      - services__Attachments=http://10.0.0.4:19081/dasapp/attachments/
-      - services__Surveys=http://10.0.0.4:19081/dasapp/survey/
- 
-    ports:
-      - "6006:80"
-
-
-  surveys:
-    image: santhoshsnair/damageassesmentapisurveys:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6007:80"
-
-
-  doculinks:
-    image: santhoshsnair/damageassesmentapidoculinks:latest
-    environment:
-      - ASPNETCORE_ENVIRONMENT=Development
-    ports:
-      - "6009:80"
-  sqlserver:
-    image: mcr.microsoft.com/mssql/server:2019-latest
-    environment:
-      - SA_PASSWORD=your_password
-      - ACCEPT_EULA=Y
-    ports:
-      - "1433:1433"
--- a/DamageAssesmentApi/docker-compose.yml
+++ b/DamageAssesmentApi/docker-compose.yml
@ -1,64 +0,0 @@
-version: '3.4'
-
-services:
-  damageassesment.api.answers:
-    image: ${DOCKER_REGISTRY-}damageassesmentapianswers
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Answers/Dockerfile
-
-  damageassesment.api.attachments:
-    image: ${DOCKER_REGISTRY-}damageassesmentapiattachments
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Attachments/Dockerfile
-
-
-  damageassesment.api.employees:
-    image: ${DOCKER_REGISTRY-}damageassesmentapiemployees
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Employees/Dockerfile
-
-
-  damageassesment.api.locations:
-    image: ${DOCKER_REGISTRY-}damageassesmentapilocations
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Locations/Dockerfile
-
-
-  damageassesment.api.questions:
-    image: ${DOCKER_REGISTRY-}damageassesmentapiquestions
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Questions/Dockerfile
-
- 
-  damageassesment.api.surveys:
-    image: ${DOCKER_REGISTRY-}damageassesmentapisurveys
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Surveys/Dockerfile
-
-
-  damageassesment.api.doculinks:
-    image: ${DOCKER_REGISTRY-}damageassesmentapidoculinks
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.DocuLinks/Dockerfile
-
-
-  damageassesment.api.responses:
-    image: ${DOCKER_REGISTRY-}damageassesmentapiresponses
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.Responses/Dockerfile
-
-
-  damageassesment.api.usersaccess:
-    image: ${DOCKER_REGISTRY-}damageassesmentapiusersaccess
-    build:
-      context: .
-      dockerfile: DamageAssesment.Api.UsersAccess/Dockerfile
-
--- a/DamageAssesmentApi/launchSettings.json
+++ b/DamageAssesmentApi/launchSettings.json
@ -1,20 +0,0 @@
-{
-  "profiles": {
-    "Docker Compose": {
-      "commandName": "DockerCompose",
-      "commandVersion": "1.0",
-      "serviceActions": {
-        "damageassesment.api.answers": "StartDebugging",
-        "damageassesment.api.attachments": "StartDebugging",
-        "damageassesment.api.employees": "StartDebugging",
-        "damageassesment.api.locations": "StartDebugging",
-        "damageassesment.api.questions": "StartDebugging",
-        "damageassesment.api.surveyresponses": "StartDebugging",
-        "damageassesment.api.surveys": "StartDebugging",
-        "damageassesment.api.doculinks": "StartDebugging",
-        "damageassesment.api.responses": "StartDebugging",
-        "damageassesment.api.usersaccess": "StartDebugging"
-      }
-    }
-  }
-}
Author	SHA1	Message	Date
Vijay Uppu	9b9bba1f60	Group by issue in responses	2024-01-22 12:17:34 -05:00
Vijay Uppu	1caa3e549b	fixed region issue	2024-01-18 11:44:13 -05:00
Vijay Uppu	d36e7632f2	added survey start and end date validation	2023-12-13 17:11:51 -05:00
Vijay Uppu	9320469798	user access module changes for populating employee Information	2023-12-12 17:13:44 -05:00
Vijay Uppu	992afeab5e	multiple questions updated based on survey id	2023-12-12 13:40:27 -05:00
Vijay Uppu	3f41cf6e10	changed download url format and added new endpoint for doculink isactive update	2023-12-04 14:52:24 -05:00
Vijay Uppu	f8c7fce182	added IsActive flag in doculinks request	2023-12-04 14:40:12 -05:00
Vijay Uppu	432baafc22	attachment and doculinks url changes	2023-12-01 17:55:45 -05:00
Vijay Uppu	902919074e	added multi language support for doculink attachments	2023-11-30 19:25:07 -05:00
Vijay Uppu	cbddb944d5	Return Employee ID for POST	2023-11-28 12:07:12 -05:00
Vijay Uppu	0c7fe88d45	fixed question translation issue	2023-11-15 12:35:17 -05:00
Vijay Uppu	f8cb7e7980	Added new endpoint for creating multiple questions	2023-11-14 15:28:16 -05:00
Vijay Uppu	9c97f08289	added new endpoint to generate dade school token	2023-11-13 15:13:25 -05:00
uppuv	3b07723ebe	removed docker file	2023-11-05 14:37:49 -05:00
uppuv	3f67b578e4	user access module with latest dev branch changes	2023-11-05 14:37:10 -05:00
uppuv	227795aeda	fixed survey issue in response level, and added logic for start and end date as optional date	2023-11-05 14:19:37 -05:00
uppuv	e8e649efd9	reverted doculinks chages for linktype grouping	2023-10-24 11:42:28 -04:00
uppuv	2182b9a6b3	added status field in survey micro service	2023-10-23 11:39:56 -04:00
uppuv	6ad5bb1572	merged latest changes from docker to dev	2023-10-13 14:48:08 -04:00
uppuv	cb3c7f8f6a	added muilti language return format for question categories for question by survey	2023-10-13 13:21:33 -04:00
uppuv	26e79432e2	table name changes	2023-10-12 16:01:24 -04:00
uppuv	885fdeb117	updated question category	2023-10-11 19:24:50 -04:00
uppuv	fa3e3bbd99	added seed data for questions and surveys for demo	2023-10-11 15:33:21 -04:00
uppuv	71d4b524e7	doculinks changes for grouping	2023-10-09 13:29:01 -04:00
uppuv	c7a2dc5910	seed changes for doculinks	2023-10-06 15:53:09 -04:00