Merge branch 'main' of https://git.is.ulstu.ru/StroevVladimir/CourseWork
This commit is contained in:
commit
e85ff82d03
@ -10,7 +10,7 @@ namespace UniversityBusinessLogic.OfficePackage
|
||||
CreatePdf(info);
|
||||
CreateParagraph(new PdfParagraph { Text = info.Title, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center });
|
||||
|
||||
CreateTable(new List<string> { "2cm", "3cm", "6cm", "3cm", "4 cm" });
|
||||
CreateTable(new List<string> { "6cm", "6cm", "6cm", "3cm", "4 cm" });
|
||||
|
||||
CreateRow(new PdfRowParameters
|
||||
{
|
||||
|
@ -197,7 +197,7 @@ namespace UniversityClientApp.Controllers
|
||||
{
|
||||
APIStorekeeper.PostRequest("api/teacher/loadreporttoword", new ReportBindingModel
|
||||
{
|
||||
FileName = "C:\\ÂðåìåííûåÎò÷¸òû\\TeachersAndStudents.docx"
|
||||
FileName = $"C:\\ÂðåìåííûåÎò÷¸òû\\TeachersAndStudents.docx"
|
||||
});
|
||||
return GetWordFile();
|
||||
}
|
||||
@ -206,7 +206,7 @@ namespace UniversityClientApp.Controllers
|
||||
{
|
||||
APIStorekeeper.PostRequest("api/teacher/loadreporttoexcel", new ReportBindingModel
|
||||
{
|
||||
FileName = "C:\\ÂðåìåííûåÎò÷¸òû\\TeachersAndStudents.xlsx"
|
||||
FileName = $"C:\\ÂðåìåííûåÎò÷¸òû\\TeachersAndStudents.xlsx"
|
||||
});
|
||||
return GetExcelFile();
|
||||
}
|
||||
|
@ -372,13 +372,13 @@ namespace UniversityClientAppWorker.Controllers
|
||||
[HttpGet]
|
||||
public IActionResult GetWordFile()
|
||||
{
|
||||
return PhysicalFile($"C:\\Users\\{Environment.UserName}\\Downloads\\Ïëàíû îáó÷åíèé ïî äèñöèïëèíàì.docx",
|
||||
return PhysicalFile($"C:\\ВременныеОтчёты\\Планы обучений по дисциплинам.docx",
|
||||
"application/vnd.openxmlformats-officedocument.wordprocessingml.document",
|
||||
"Ïëàíû îáó÷åíèé ïî äèñöèïëèíàì.docx");
|
||||
}
|
||||
public IActionResult GetExcelFile()
|
||||
{
|
||||
return PhysicalFile($"C:\\Users\\{Environment.UserName}\\Downloads\\Ïëàíû îáó÷åíèé ïî äèñöèïëèíàì.xlsx",
|
||||
return PhysicalFile($"C:\\ВременныеОтчёты\\Планы обучений по дисциплинам.xlsx",
|
||||
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
|
||||
"Ïëàíû îáó÷åíèé ïî äèñöèïëèíàì.xlsx");
|
||||
}
|
||||
|
@ -11,7 +11,7 @@ namespace UniversityDatabaseImplement
|
||||
if (optionsBuilder.IsConfigured == false)
|
||||
{
|
||||
//Возможно понадобится писать вместо (localdb) название пк, вот пк Егора: DESKTOP-N8BRIPR; other-name: LAPTOP-DYCTATOR; other-name: DyCTaTOR
|
||||
optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-N8BRIPR\SQLEXPRESS;Initial Catalog=UniversityDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
optionsBuilder.UseSqlServer(@"Data Source=LAPTOP-DYCTATOR\SQLEXPRESS;Initial Catalog=UniversityDatabaseFull;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True");
|
||||
}
|
||||
base.OnConfiguring(optionsBuilder);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user