From 84a5ee78c7d8aa58c9b0dc9b11a018c8f3356e7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Wed, 29 May 2024 02:26:50 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=D0=B0=20=D0=BA=D1=83=D1=80=D1=81=D1=8B=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=B8=D1=85=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?,=20=D0=BF=D1=8B=D1=82=D0=B0=D1=8E=D1=81=D1=8C=20=D0=BD=D0=B0?= =?UTF-8?q?=D0=B9=D1=82=D0=B8=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20(?= =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D0=B0=20=D0=B4?= =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D0=B5=D1=82=D1=81=D1=8F=20?= =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20=D0=BA=D1=83=D1=80=D1=81?= =?UTF-8?q?=20+=20=D0=B2=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D0=BE=D0=BC=20=D1=80=D0=B5=D1=86=D0=B5=D0=BF=D1=82=D0=B5=20?= =?UTF-8?q?=D0=BD=D0=BE=D0=BC=D0=B5=D1=80=20=D0=BA=D1=83=D1=80=D1=81=D0=B0?= =?UTF-8?q?=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B2=D0=B5=D0=BD=20=D0=B2=D1=8B?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D0=BD=D0=BD=D0=BE=D0=BC=D1=83,=20=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D1=81=D1=82=D0=BE=20=D0=BD=D1=83=D0=BC=D0=B5?= =?UTF-8?q?=D1=80=D1=83=D0=B5=D1=82=D1=81=D1=8F=20=D0=BF=D0=BE=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=80=D1=8F=D0=B4=D0=BA=D1=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/SuretorReportLogic.cs | 2 +- .../AbstractSaveToWordCoursesByProcedures.cs | 10 +++++----- .../Controllers/HomeController.cs | 7 +++++-- .../Views/Home/CreateRecipe.cshtml | 7 +++---- .../Views/Home/Recipes.cshtml | 3 +-- Polyclinic/PolyclinicWebAppSuretor/jopa.docx | Bin 1268 -> 0 bytes .../про животик.docx | Bin 0 -> 1357 bytes 7 files changed, 15 insertions(+), 14 deletions(-) delete mode 100644 Polyclinic/PolyclinicWebAppSuretor/jopa.docx create mode 100644 Polyclinic/PolyclinicWebAppSuretor/про животик.docx diff --git a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs index a7d132b..021f8b3 100644 --- a/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs +++ b/Polyclinic/PolyclinicBusinessLogic/BusinessLogics/SuretorReportLogic.cs @@ -105,7 +105,7 @@ namespace PolyclinicBusinessLogic.BusinessLogics saveToWord.CreateDoc(new WordCoursesByProceduresInfo { FileName = model.FileName, - Title = "Курсы по процедурам", + Title = "Курсы по процедуре", Courses = GetProcedureCourses(procedureSearchMode) }); } diff --git a/Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractSaveToWordCoursesByProcedures.cs b/Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractSaveToWordCoursesByProcedures.cs index ae6a525..62e610a 100644 --- a/Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractSaveToWordCoursesByProcedures.cs +++ b/Polyclinic/PolyclinicBusinessLogic/OfficePackage/AbstractSaveToWordCoursesByProcedures.cs @@ -12,11 +12,11 @@ namespace PolyclinicBusinessLogic.OfficePackage { Texts = new List<(string, WordTextProperties)> { - (info.Title, new WordTextProperties { Bold = true, Size = "24", }) + (info.Title, new WordTextProperties { Bold = true, Size = "32", }) }, TextProperties = new WordTextProperties { - Size = "24", + Size = "32", JustificationType = WordJustificationType.Center } }); @@ -26,13 +26,13 @@ namespace PolyclinicBusinessLogic.OfficePackage { Texts = new List<(string, WordTextProperties)> { - ("Количество пилюль в день: " + course.PillsPerDay.ToString() + " единиц", new WordTextProperties{ Size = "16"}), - ("Количество дней приёма: " + course.DaysCount.ToString() + " дней", new WordTextProperties{ Size = "16"}), + ("Количество пилюль в день: " + course.PillsPerDay.ToString() + " единиц", new WordTextProperties{ Size = "24"}), + ("Количество дней приёма: " + course.DaysCount.ToString() + " дней", new WordTextProperties{ Size = "24"}), }, TextProperties = new WordTextProperties { - Size = "16", + Size = "24", JustificationType = WordJustificationType.Both } }); diff --git a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs index f7c7b88..c700dcb 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs +++ b/Polyclinic/PolyclinicWebAppSuretor/Controllers/HomeController.cs @@ -80,12 +80,14 @@ namespace PolyclinicWebAppSuretor.Controllers { ProceduresCount = model.RecipeViewModel.ProceduresCount, Comment = model.RecipeViewModel.Comment, + CourseId = model.RecipeViewModel.CourseId, RecipeProcedures = selectedProcedures .ToDictionary( x => x, - x => allProcedures.Where(y => y.Id == x) as IProcedureModel + x => allProcedures.First(y => y.Id == x) as IProcedureModel ) }; + _recipeLogic.Create(recipe); return RedirectToAction("Recipes"); } @@ -114,10 +116,11 @@ namespace PolyclinicWebAppSuretor.Controllers Id = id, ProceduresCount = model.RecipeViewModel.ProceduresCount, Comment = model.RecipeViewModel.Comment, + CourseId = model.RecipeViewModel.CourseId, RecipeProcedures = selectedProcedures .ToDictionary( x => x, - x => allProcedures.Where(y => y.Id == x) as IProcedureModel + x => allProcedures.First(y => y.Id == x) as IProcedureModel ) }; _recipeLogic.Update(recipe); diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml index 6df9e70..a514401 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/CreateRecipe.cshtml @@ -29,11 +29,11 @@

Курс (номер):

- + @foreach (var course in ViewBag.Courses) { - + } @@ -65,7 +65,6 @@ -
diff --git a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Recipes.cshtml b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Recipes.cshtml index 091e167..aa79c03 100644 --- a/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Recipes.cshtml +++ b/Polyclinic/PolyclinicWebAppSuretor/Views/Home/Recipes.cshtml @@ -47,7 +47,7 @@ @item.Id @item.Comment - @item.ProceduresCount@item.ProceduresCount @item.CourseId @@ -69,7 +69,6 @@ - } diff --git a/Polyclinic/PolyclinicWebAppSuretor/jopa.docx b/Polyclinic/PolyclinicWebAppSuretor/jopa.docx deleted file mode 100644 index 104bfb0efb19b114ec81232b53e199941a2753de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1268 zcmWIWW@Zs#U|`^2@L<>*vH4(@y#ylz!(Jd31d5jD7p3T@j`ZrnG zWB!S4`+DE8iQb)lgUy!f>GYM;-Lx(j2X3r!{mC5w4MqlVFg|itexL;mLJ;N#24j3t zYEH4f9*BIud%ul6Fd!AmQj3Z+^Yd(#4D}3@6jJk&^HVbO(ruMWOVV^LlLu5 zOMohhGcpT`6@XguifxrLN=gc>^!1CAGg5OCi}msgQuBZ^Y57IDi6ua8QM!IXVsdt3 zdaAyWfq|Jm&_;wAN~mTkgj5!!5@TY1T3TjustYs~U@=%9RfUp5NMccXYKg6qK1TXc zQt(W%RSHT=O*T)mOffLBG)y!}HcnJh(6_VENAa;8YLMQSW(to21}6v$1A{c$IX|xi zm?+~xz9^0brA^|47OaQNAWeqYt6KuH7Z{{2scDI&IVB3N6+q`eVif2WB?YMaAc34% zP>_?E42}x@vb+?uc+-W1A3UFdLam@EKRLCy7?>n-bM)Xcxrv#1+F;{>;f2L!Pzoc> zYG`r+rALm-C*+X+%ydNaXm& z{r0Jyti9%bY(g>XoVbIv_5NE zbK1>EIf~C?J>F)y=gWsbjg#D6(s*d)qgksJm*-Y&+Fq8j{;h3e_>Bh%?i)5HM;zGW zkiezS+P!jz*5CQc4<}u?j2s8Vl*XZeredWJc#~c8S9|myzEMK)aTniXKAj}PnpZKEGoML@F5cz)h zej9sW3@MbQ78Pga=h-S5>KQ00q~;~(r)1`(+bWfor0H5H+1uF!rRF4-096!cWEK=F z0JY>5+bU(0loVL$>lY_yq~<0T>*W`u<^g5W@{4j4OMu*>bp3+FD)zw9MpG7ijXrVz54{3MGY*#G>@n5?dvGjD)GA;F)5p6l7?Y zl4fp^Y><{>U}<8MlBA@dZ)c;A;$u71AiXcm6dnZ(P7oFb25Gc&eqISMwa0^eQ5*|O z^uz}(SPz*&nhdd5w*+J_Fi2fe(-KQ_N)%ixfX;!$D9|lR3Q+e!0y(juASW{!92NRy zc`0b|rV9x_cm@WAT0v2Ma%yogFiGU*=)q-j6EpL)!Nvo_3yaO56h@lW(BuM2n~0PG zw?ZErQoyKSWD;S(UH$;$0|{V6Izl`4?19j`02sSSnFU=VdLlq*{LF+kNd$PavVjya N1K~~}UB?3A0RTF7