diff --git a/backend/src/mms.Application/Report/Command/DownloadReportCommand.cs b/backend/src/mms.Application/Report/Command/DownloadReportCommand.cs deleted file mode 100644 index 7e7def8..0000000 --- a/backend/src/mms.Application/Report/Command/DownloadReportCommand.cs +++ /dev/null @@ -1,15 +0,0 @@ -using AspNetCoreHero.Results; -using MediatR; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace mms.Application.Report.Command -{ - public class DownloadReportCommand : IRequest - { - public string Id { get; set; } - } -} \ No newline at end of file diff --git a/backend/src/mms.Application/Report/Command/DownloadReportCommandHandler.cs b/backend/src/mms.Application/Report/Command/DownloadReportCommandHandler.cs deleted file mode 100644 index 8b6412d..0000000 --- a/backend/src/mms.Application/Report/Command/DownloadReportCommandHandler.cs +++ /dev/null @@ -1,84 +0,0 @@ -using AspNetCoreHero.Results; -using AutoMapper; -using DinkToPdf; -using DinkToPdf.Contracts; -using MediatR; -using Microsoft.EntityFrameworkCore; -using mms.Application.Mentors.Command; -using mms.Infrastructure.Context; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace mms.Application.Report.Command -{ - public class DownloadReportCommandHandler : IRequestHandler - { - private readonly ApplicationContext _context; - private readonly IMapper _mapper; - private readonly IConverter _converter; - public DownloadReportCommandHandler(ApplicationContext context, IMapper mapper, IConverter converter) - { - _context = context; - _mapper = mapper; - _converter = converter; - } - - public async Task Handle(DownloadReportCommand request, CancellationToken cancellationToken) - { - - var report = await _context.Reports.Where(a => a.Id == request.Id).FirstOrDefaultAsync(); - - var html = $@" - - - - {report.ReportTitle} - - -

Major Achievements

-

{report.Achievements}.

- h1>Major Blockers -

{report.Blocker}.

-

Major Recommendations

-

{report.Recommendations}.

- - - "; - GlobalSettings globalSettings = new GlobalSettings(); - globalSettings.ColorMode = ColorMode.Color; - globalSettings.Orientation = Orientation.Portrait; - globalSettings.PaperSize = PaperKind.A4; - globalSettings.Margins = new MarginSettings { Top = 25, Bottom = 25 }; - ObjectSettings objectSettings = new ObjectSettings(); - objectSettings.PagesCount = true; - objectSettings.HtmlContent = html; - WebSettings webSettings = new WebSettings(); - webSettings.DefaultEncoding = "utf-8"; - HeaderSettings headerSettings = new HeaderSettings(); - headerSettings.FontSize = 15; - headerSettings.FontName = "Ariel"; - headerSettings.Right = "Page [page] of [toPage]"; - headerSettings.Line = true; - FooterSettings footerSettings = new FooterSettings(); - footerSettings.FontSize = 12; - footerSettings.FontName = "Ariel"; - footerSettings.Center = "ALC 2023"; - footerSettings.Line = true; - objectSettings.HeaderSettings = headerSettings; - objectSettings.FooterSettings = footerSettings; - objectSettings.WebSettings = webSettings; - HtmlToPdfDocument htmlToPdfDocument = new HtmlToPdfDocument() - { - GlobalSettings = globalSettings, - Objects = { objectSettings }, - }; - - var pdfDocument = _converter.Convert(htmlToPdfDocument); - - return pdfDocument; - } - } -} diff --git a/backend/src/mms.api/Controllers/ReportController.cs b/backend/src/mms.api/Controllers/ReportController.cs index aa46659..508aab2 100644 --- a/backend/src/mms.api/Controllers/ReportController.cs +++ b/backend/src/mms.api/Controllers/ReportController.cs @@ -94,14 +94,6 @@ public async Task GetReportById(string id) return Ok(result); } - [HttpGet("downloadReport/{reportId}")] - public async Task GetDownloadPdf(string reportId) - { - var result = await Mediator.Send(new DownloadReportCommand { Id = reportId }); - return File(result,"application/octet-stream", "report.pdf"); - } - - [HttpPost("report")] public async Task CreateTask(CreateReportCommand command) { diff --git a/backend/src/mms.api/Program.cs b/backend/src/mms.api/Program.cs index 15a6ac2..5415880 100644 --- a/backend/src/mms.api/Program.cs +++ b/backend/src/mms.api/Program.cs @@ -1,5 +1,3 @@ -using DinkToPdf.Contracts; -using DinkToPdf; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.Configuration; using mms.api.Configurations; @@ -10,8 +8,6 @@ using mms.Infrastructure; using mms.Infrastructure.Context; using mms.Infrastructure.Seeder; -using mms.Application.Report.Command; -using System.IO; var builder = WebApplication.CreateBuilder(args); @@ -24,10 +20,6 @@ builder.Logging.AddConsole(); // Add services to the container. -CustomAssemblyLoadContext context = new CustomAssemblyLoadContext(); -context.LoadUnmanagedLibrary(Path.Combine(Directory.GetCurrentDirectory(), "libraries/libwkhtmltox.dll")); -builder.Services.AddSingleton(typeof(IConverter), - new SynchronizedConverter(new PdfTools())); builder.Services.AddControllers(); builder.Services.AddSignalR(); // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle diff --git a/backend/src/mms.api/libraries/libwkhtmltox.dll b/backend/src/mms.api/libraries/libwkhtmltox.dll deleted file mode 100644 index 98a007b..0000000 Binary files a/backend/src/mms.api/libraries/libwkhtmltox.dll and /dev/null differ diff --git a/backend/src/mms.api/libraries/libwkhtmltox.dylib b/backend/src/mms.api/libraries/libwkhtmltox.dylib deleted file mode 100644 index 0263cad..0000000 Binary files a/backend/src/mms.api/libraries/libwkhtmltox.dylib and /dev/null differ diff --git a/backend/src/mms.api/libraries/libwkhtmltox.so b/backend/src/mms.api/libraries/libwkhtmltox.so deleted file mode 100644 index eecc883..0000000 Binary files a/backend/src/mms.api/libraries/libwkhtmltox.so and /dev/null differ diff --git a/frontend/mms-Admin/package-lock.json b/frontend/mms-Admin/package-lock.json index d03015c..e8210c9 100644 --- a/frontend/mms-Admin/package-lock.json +++ b/frontend/mms-Admin/package-lock.json @@ -4946,6 +4946,19 @@ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "license": "ISC" }, + "node_modules/fsevents": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "hasInstallScript": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, "node_modules/function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -9351,11 +9364,10 @@ } }, "node_modules/rollup": { - "version": "3.20.7", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.20.7.tgz", - "integrity": "sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA==", + "version": "3.25.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz", + "integrity": "sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ==", "dev": true, - "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -10184,15 +10196,14 @@ } }, "node_modules/vite": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.1.tgz", - "integrity": "sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg==", + "version": "4.3.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz", + "integrity": "sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.17.5", - "postcss": "^8.4.21", - "rollup": "^3.20.2" + "postcss": "^8.4.23", + "rollup": "^3.21.0" }, "bin": { "vite": "bin/vite.js" diff --git a/frontend/mms-Admin/yarn.lock b/frontend/mms-Admin/yarn.lock index d2c7500..3f89813 100644 --- a/frontend/mms-Admin/yarn.lock +++ b/frontend/mms-Admin/yarn.lock @@ -3969,7 +3969,7 @@ postcss-value-parser@^4.0.2: resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== -postcss@^8.4.21: +postcss@^8.4.23: version "8.4.23" resolved "https://registry.npmjs.org/postcss/-/postcss-8.4.23.tgz" integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA== @@ -4332,10 +4332,10 @@ rimraf@^3.0.2: dependencies: glob "^7.1.3" -rollup@^1.20.0||^2.0.0||^3.0.0, rollup@^3.20.2: - version "3.20.7" - resolved "https://registry.npmjs.org/rollup/-/rollup-3.20.7.tgz" - integrity sha512-P7E2zezKSLhWnTz46XxjSmInrbOCiul1yf+kJccMxT56vxjHwCbDfoLbiqFgu+WQoo9ij2PkraYaBstgB2prBA== +rollup@^1.20.0||^2.0.0||^3.0.0, rollup@^3.21.0: + version "3.25.1" + resolved "https://registry.npmjs.org/rollup/-/rollup-3.25.1.tgz" + integrity sha512-tywOR+rwIt5m2ZAWSe5AIJcTat8vGlnPFAv15ycCrw33t6iFsXZ6mzHVFh2psSjxQPmI+xgzMZZizUAukBI4aQ== optionalDependencies: fsevents "~2.3.2" @@ -4881,13 +4881,13 @@ vite-plugin-svgr@^2.4.0: "@svgr/core" "^6.5.1" "vite@^2.6.0 || 3 || 4", vite@^4.1.0-beta.0, vite@^4.2.0: - version "4.3.1" - resolved "https://registry.npmjs.org/vite/-/vite-4.3.1.tgz" - integrity sha512-EPmfPLAI79Z/RofuMvkIS0Yr091T2ReUoXQqc5ppBX/sjFRhHKiPPF/R46cTdoci/XgeQpB23diiJxq5w30vdg== + version "4.3.9" + resolved "https://registry.npmjs.org/vite/-/vite-4.3.9.tgz" + integrity sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg== dependencies: esbuild "^0.17.5" - postcss "^8.4.21" - rollup "^3.20.2" + postcss "^8.4.23" + rollup "^3.21.0" optionalDependencies: fsevents "~2.3.2"