Работает отображение диагнозов

2024-05-08 01:46:11 +04:00 · 2024-05-08 01:46:11 +04:00 · 69d271b9a2
commit 69d271b9a2
parent 164322faa1
9 changed files with 357 additions and 26 deletions
--- a/Medical/MedicalPostgresqlDatabase/AbstractPostgresqlStorage.cs
+++ b/Medical/MedicalPostgresqlDatabase/AbstractPostgresqlStorage.cs
@ -13,7 +13,7 @@ namespace MedicalPostgresqlDatabase
        public abstract void Update(T item);
        protected NpgsqlConnection GetConnection()
        {
-            return new NpgsqlConnection("Host=127.0.0.1;Port=5555;Username=elina;Database=beauty_salon;Password=elina");
+            return new NpgsqlConnection("Host=127.0.0.1;Port=5555;Username=postgres;Database=medicalbase;Password=postgres");
        }
    }
 }
--- a/Medical/MedicalView/Diagnoses/FormDiagnoses.Designer.cs
+++ b/Medical/MedicalView/Diagnoses/FormDiagnoses.Designer.cs
@ -0,0 +1,117 @@
+namespace MedicalView
+{
+    partial class FormDiagnoses
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dataGridView = new DataGridView();
+            menuStrip = new MenuStrip();
+            обновитьToolStripMenuItem = new ToolStripMenuItem();
+            добавитьToolStripMenuItem = new ToolStripMenuItem();
+            изменитьToolStripMenuItem = new ToolStripMenuItem();
+            удалитьToolStripMenuItem = new ToolStripMenuItem();
+            ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit();
+            menuStrip.SuspendLayout();
+            SuspendLayout();
+            // 
+            // dataGridView
+            // 
+            dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            dataGridView.Dock = DockStyle.Fill;
+            dataGridView.Location = new Point(0, 28);
+            dataGridView.MultiSelect = false;
+            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersVisible = false;
+            dataGridView.RowHeadersWidth = 51;
+            dataGridView.RowTemplate.Height = 29;
+            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
+            dataGridView.Size = new Size(800, 422);
+            dataGridView.TabIndex = 3;
+            // 
+            // menuStrip
+            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
+            menuStrip.Items.AddRange(new ToolStripItem[] { обновитьToolStripMenuItem, добавитьToolStripMenuItem, изменитьToolStripMenuItem, удалитьToolStripMenuItem });
+            menuStrip.Location = new Point(0, 0);
+            menuStrip.Name = "menuStrip";
+            menuStrip.Size = new Size(800, 28);
+            menuStrip.TabIndex = 4;
+            menuStrip.Text = "menuStrip1";
+            // 
+            // обновитьToolStripMenuItem
+            // 
+            обновитьToolStripMenuItem.Name = "обновитьToolStripMenuItem";
+            обновитьToolStripMenuItem.Size = new Size(92, 24);
+            обновитьToolStripMenuItem.Text = "Обновить";
+            обновитьToolStripMenuItem.Click += this.RefreshToolStripMenuItem_Click;
+            // 
+            // добавитьToolStripMenuItem
+            // 
+            добавитьToolStripMenuItem.Name = "добавитьToolStripMenuItem";
+            добавитьToolStripMenuItem.Size = new Size(90, 24);
+            добавитьToolStripMenuItem.Text = "Добавить";
+            // 
+            // изменитьToolStripMenuItem
+            // 
+            изменитьToolStripMenuItem.Name = "изменитьToolStripMenuItem";
+            изменитьToolStripMenuItem.Size = new Size(92, 24);
+            изменитьToolStripMenuItem.Text = "Изменить";
+            // 
+            // удалитьToolStripMenuItem
+            // 
+            удалитьToolStripMenuItem.Name = "удалитьToolStripMenuItem";
+            удалитьToolStripMenuItem.Size = new Size(79, 24);
+            удалитьToolStripMenuItem.Text = "Удалить";
+            // 
+            // FormDiagnoses
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(800, 450);
+            Controls.Add(dataGridView);
+            Controls.Add(menuStrip);
+            MainMenuStrip = menuStrip;
+            Name = "FormDiagnoses";
+            Text = "Диагнозы";
+            Load += FormDiagnoses_Load;
+            ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit();
+            menuStrip.ResumeLayout(false);
+            menuStrip.PerformLayout();
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+        private DataGridView dataGridView;
+        private MenuStrip menuStrip;
+        private ToolStripMenuItem обновитьToolStripMenuItem;
+        private ToolStripMenuItem добавитьToolStripMenuItem;
+        private ToolStripMenuItem изменитьToolStripMenuItem;
+        private ToolStripMenuItem удалитьToolStripMenuItem;
+    }
+}
--- a/Medical/MedicalView/Diagnoses/FormDiagnoses.cs
+++ b/Medical/MedicalView/Diagnoses/FormDiagnoses.cs
@ -0,0 +1,44 @@
+using MedicalDatabaseContracts;
+using MedicalDatabaseContracts.Models;
+using Microsoft.Extensions.Logging;
+
+namespace MedicalView
+{
+    public partial class FormDiagnoses : Form
+    {
+        private ILogger _logger;
+        private IStorage<Diagnose> _diagnosesStorage;
+        public FormDiagnoses(ILogger<FormDiagnoses> logger, IStorage<Diagnose> diagnosesStorage)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _diagnosesStorage = diagnosesStorage;
+        }
+
+        private void FormDiagnoses_Load(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void RefreshToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            LoadData();
+        }
+
+        private void LoadData()
+        {
+            try
+            {
+                var diagnoses = _diagnosesStorage.GetAll();
+                dataGridView.DataSource = diagnoses;
+                _logger.LogInformation("Список диагнозов загружен успешно");
+            }
+            catch (Exception ex)
+            {
+                string errorMessage = "Ошибка загрузки списка диагнозов";
+                _logger.LogError(string.Join(", ", errorMessage, $"\"{ex.Message}\""));
+                MessageBox.Show(string.Join("\n\n", errorMessage, $"{ex.Message}"), "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+    }
+}
--- a/Medical/MedicalView/Diagnoses/FormDiagnoses.resx
+++ b/Medical/MedicalView/Diagnoses/FormDiagnoses.resx
@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="menuStrip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
--- a/Medical/MedicalView/FormMain.Designer.cs
+++ b/Medical/MedicalView/FormMain.Designer.cs
@ -48,10 +48,12 @@
            // 
            // menuStrip
            // 
+            menuStrip.ImageScalingSize = new Size(20, 20);
            menuStrip.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, пациентыToolStripMenuItem1 });
            menuStrip.Location = new Point(0, 0);
            menuStrip.Name = "menuStrip";
-            menuStrip.Size = new Size(755, 24);
+            menuStrip.Padding = new Padding(7, 3, 0, 3);
+            menuStrip.Size = new Size(863, 30);
            menuStrip.TabIndex = 0;
            menuStrip.Text = "menuStrip1";
            // 
@ -59,42 +61,45 @@
            // 
            справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { специализацииToolStripMenuItem, диагнозыToolStripMenuItem, врачиToolStripMenuItem });
            справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem";
-            справочникиToolStripMenuItem.Size = new Size(94, 20);
+            справочникиToolStripMenuItem.Size = new Size(117, 24);
            справочникиToolStripMenuItem.Text = "Справочники";
            // 
            // специализацииToolStripMenuItem
            // 
            специализацииToolStripMenuItem.Name = "специализацииToolStripMenuItem";
-            специализацииToolStripMenuItem.Size = new Size(161, 22);
+            специализацииToolStripMenuItem.Size = new Size(224, 26);
            специализацииToolStripMenuItem.Text = "Специализации";
            // 
            // диагнозыToolStripMenuItem
            // 
            диагнозыToolStripMenuItem.Name = "диагнозыToolStripMenuItem";
-            диагнозыToolStripMenuItem.Size = new Size(161, 22);
+            диагнозыToolStripMenuItem.Size = new Size(224, 26);
            диагнозыToolStripMenuItem.Text = "Диагнозы";
+            диагнозыToolStripMenuItem.Click += DiagnosesToolStripMenuItem_Click;
            // 
            // врачиToolStripMenuItem
            // 
            врачиToolStripMenuItem.Name = "врачиToolStripMenuItem";
-            врачиToolStripMenuItem.Size = new Size(161, 22);
+            врачиToolStripMenuItem.Size = new Size(224, 26);
            врачиToolStripMenuItem.Text = "Врачи";
            // 
            // пациентыToolStripMenuItem1
            // 
            пациентыToolStripMenuItem1.Name = "пациентыToolStripMenuItem1";
-            пациентыToolStripMenuItem1.Size = new Size(75, 20);
+            пациентыToolStripMenuItem1.Size = new Size(94, 24);
            пациентыToolStripMenuItem1.Text = "Пациенты";
            // 
            // dataGridView
            // 
            dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
            dataGridView.Dock = DockStyle.Fill;
-            dataGridView.Location = new Point(0, 24);
+            dataGridView.Location = new Point(0, 30);
+            dataGridView.Margin = new Padding(3, 4, 3, 4);
            dataGridView.Name = "dataGridView";
+            dataGridView.RowHeadersWidth = 51;
            dataGridView.RowTemplate.Height = 25;
            dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-            dataGridView.Size = new Size(755, 277);
+            dataGridView.Size = new Size(863, 371);
            dataGridView.TabIndex = 1;
            // 
            // panel
@ -105,17 +110,19 @@
            panel.Controls.Add(dateTimePicker1);
            panel.Controls.Add(comboBoxDoctor);
            panel.Dock = DockStyle.Top;
-            panel.Location = new Point(0, 24);
+            panel.Location = new Point(0, 30);
+            panel.Margin = new Padding(3, 4, 3, 4);
            panel.Name = "panel";
-            panel.Size = new Size(755, 29);
+            panel.Size = new Size(863, 39);
            panel.TabIndex = 2;
            // 
            // buttonEdit
            // 
            buttonEdit.Anchor = AnchorStyles.Left;
-            buttonEdit.Location = new Point(418, 2);
+            buttonEdit.Location = new Point(478, 3);
+            buttonEdit.Margin = new Padding(3, 4, 3, 4);
            buttonEdit.Name = "buttonEdit";
-            buttonEdit.Size = new Size(75, 23);
+            buttonEdit.Size = new Size(86, 31);
            buttonEdit.TabIndex = 4;
            buttonEdit.Text = "Изменить";
            buttonEdit.UseVisualStyleBackColor = true;
@ -123,9 +130,10 @@
            // buttonDelete
            // 
            buttonDelete.Anchor = AnchorStyles.Left;
-            buttonDelete.Location = new Point(499, 2);
+            buttonDelete.Location = new Point(570, 3);
+            buttonDelete.Margin = new Padding(3, 4, 3, 4);
            buttonDelete.Name = "buttonDelete";
-            buttonDelete.Size = new Size(75, 23);
+            buttonDelete.Size = new Size(86, 31);
            buttonDelete.TabIndex = 3;
            buttonDelete.Text = "Удалить";
            buttonDelete.UseVisualStyleBackColor = true;
@ -133,9 +141,10 @@
            // buttonAdd
            // 
            buttonAdd.Anchor = AnchorStyles.Left;
-            buttonAdd.Location = new Point(337, 2);
+            buttonAdd.Location = new Point(385, 3);
+            buttonAdd.Margin = new Padding(3, 4, 3, 4);
            buttonAdd.Name = "buttonAdd";
-            buttonAdd.Size = new Size(75, 23);
+            buttonAdd.Size = new Size(86, 31);
            buttonAdd.TabIndex = 2;
            buttonAdd.Text = "Добавить";
            buttonAdd.UseVisualStyleBackColor = true;
@ -143,9 +152,10 @@
            // dateTimePicker1
            // 
            dateTimePicker1.Anchor = AnchorStyles.Left;
-            dateTimePicker1.Location = new Point(181, 3);
+            dateTimePicker1.Location = new Point(207, 4);
+            dateTimePicker1.Margin = new Padding(3, 4, 3, 4);
            dateTimePicker1.Name = "dateTimePicker1";
-            dateTimePicker1.Size = new Size(139, 23);
+            dateTimePicker1.Size = new Size(158, 27);
            dateTimePicker1.TabIndex = 1;
            // 
            // comboBoxDoctor
@ -153,21 +163,23 @@
            comboBoxDoctor.Anchor = AnchorStyles.Left;
            comboBoxDoctor.DropDownStyle = ComboBoxStyle.DropDownList;
            comboBoxDoctor.FormattingEnabled = true;
-            comboBoxDoctor.Location = new Point(3, 3);
+            comboBoxDoctor.Location = new Point(3, 4);
+            comboBoxDoctor.Margin = new Padding(3, 4, 3, 4);
            comboBoxDoctor.Name = "comboBoxDoctor";
-            comboBoxDoctor.Size = new Size(172, 23);
+            comboBoxDoctor.Size = new Size(196, 28);
            comboBoxDoctor.TabIndex = 0;
            // 
            // FormMain
            // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
            AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(755, 301);
+            ClientSize = new Size(863, 401);
            Controls.Add(panel);
            Controls.Add(dataGridView);
            Controls.Add(menuStrip);
            MainMenuStrip = menuStrip;
-            MinimumSize = new Size(600, 340);
+            Margin = new Padding(3, 4, 3, 4);
+            MinimumSize = new Size(683, 438);
            Name = "FormMain";
            Text = "Записи посещений";
            Load += FormMain_Load;
--- a/Medical/MedicalView/FormMain.cs
+++ b/Medical/MedicalView/FormMain.cs
@ -9,7 +9,16 @@

        private void FormMain_Load(object sender, EventArgs e)
        {
-            
+
+        }
+
+        private void DiagnosesToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormDiagnoses));
+            if (service is FormDiagnoses form)
+            {
+                form.ShowDialog();
+            }
        }
    }
 }
--- a/Medical/MedicalView/MedicalView.csproj
+++ b/Medical/MedicalView/MedicalView.csproj
@ -8,6 +8,16 @@
    <ImplicitUsings>enable</ImplicitUsings>
  </PropertyGroup>

+  <ItemGroup>
+    <None Remove="nlog.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="nlog.config">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
--- a/Medical/MedicalView/Program.cs
+++ b/Medical/MedicalView/Program.cs
@ -35,10 +35,10 @@ namespace MedicalView
                option.SetMinimumLevel(LogLevel.Information);
                option.AddNLog("nlog.config");
            });
-            ////services.AddTransient<IComponentStorage, ComponentStorage>();
            services.AddTransient<IStorage<Diagnose>, DiagnosesStorage>();

            services.AddTransient<FormMain>();
+            services.AddTransient<FormDiagnoses>();
        }
    }
 }
--- a/Medical/MedicalView/nlog.config
+++ b/Medical/MedicalView/nlog.config
@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+	<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+		  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		  autoReload="true" internalLogLevel="Info">
+
+		<targets>
+			<target xsi:type="File" name="tofile" fileName="log-${shortdate}.log" />
+		</targets>
+
+		<rules>
+			<logger name="*" ninlevel="Debug" writeTo="tofile" />
+		</rules>
+
+	</nlog>
+</configuration>