Browse Source

cimmit 6 day

u21-25prischep 1 year ago
parent
commit
457c4084b6

BIN
.vs/СУБД Швейная фабрика/FileContentIndex/3aec410f-c25a-4b2b-963c-3e368460e8df.vsidx


BIN
.vs/СУБД Швейная фабрика/FileContentIndex/78c0678e-abea-4e24-8c99-2400174c1aac.vsidx


BIN
.vs/СУБД Швейная фабрика/v17/.suo


+ 7 - 5
СУБД Швейная фабрика/FormAddZakaz.Designer.cs

@@ -176,10 +176,11 @@
             // 
             this.BtnCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
             this.BtnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.BtnCancel.Location = new System.Drawing.Point(358, 417);
+            this.BtnCancel.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.BtnCancel.Location = new System.Drawing.Point(342, 406);
             this.BtnCancel.Margin = new System.Windows.Forms.Padding(2);
             this.BtnCancel.Name = "BtnCancel";
-            this.BtnCancel.Size = new System.Drawing.Size(133, 23);
+            this.BtnCancel.Size = new System.Drawing.Size(136, 37);
             this.BtnCancel.TabIndex = 19;
             this.BtnCancel.Text = "Отменить";
             this.BtnCancel.UseVisualStyleBackColor = false;
@@ -187,10 +188,11 @@
             // BtnOK
             // 
             this.BtnOK.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
-            this.BtnOK.Location = new System.Drawing.Point(98, 417);
+            this.BtnOK.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.BtnOK.Location = new System.Drawing.Point(71, 406);
             this.BtnOK.Margin = new System.Windows.Forms.Padding(2);
             this.BtnOK.Name = "BtnOK";
-            this.BtnOK.Size = new System.Drawing.Size(149, 23);
+            this.BtnOK.Size = new System.Drawing.Size(152, 37);
             this.BtnOK.TabIndex = 18;
             this.BtnOK.Text = "Сформировать заказ";
             this.BtnOK.UseVisualStyleBackColor = false;
@@ -457,7 +459,7 @@
             // label1
             // 
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label1.Font = new System.Drawing.Font("Arial Narrow", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.label1.Location = new System.Drawing.Point(132, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";

+ 35 - 24
СУБД Швейная фабрика/FormAuthorization.Designer.cs

@@ -70,19 +70,21 @@
             // 
             // TbxCapcha
             // 
-            this.TbxCapcha.Location = new System.Drawing.Point(201, 356);
+            this.TbxCapcha.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.TbxCapcha.Location = new System.Drawing.Point(124, 383);
             this.TbxCapcha.Margin = new System.Windows.Forms.Padding(2);
             this.TbxCapcha.Name = "TbxCapcha";
-            this.TbxCapcha.Size = new System.Drawing.Size(87, 20);
+            this.TbxCapcha.Size = new System.Drawing.Size(87, 22);
             this.TbxCapcha.TabIndex = 26;
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(114, 359);
+            this.label5.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label5.Location = new System.Drawing.Point(37, 386);
             this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(83, 13);
+            this.label5.Size = new System.Drawing.Size(85, 16);
             this.label5.TabIndex = 25;
             this.label5.Text = "Введите капчу:";
             // 
@@ -90,7 +92,7 @@
             // 
             this.LblCapcha.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
             this.LblCapcha.Font = new System.Drawing.Font("Segoe Script", 18F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.LblCapcha.Location = new System.Drawing.Point(112, 307);
+            this.LblCapcha.Location = new System.Drawing.Point(35, 334);
             this.LblCapcha.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.LblCapcha.Name = "LblCapcha";
             this.LblCapcha.Size = new System.Drawing.Size(119, 40);
@@ -102,11 +104,12 @@
             // LblReg
             // 
             this.LblReg.AutoSize = true;
+            this.LblReg.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.LblReg.ForeColor = System.Drawing.Color.Blue;
-            this.LblReg.Location = new System.Drawing.Point(116, 456);
+            this.LblReg.Location = new System.Drawing.Point(37, 450);
             this.LblReg.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.LblReg.Name = "LblReg";
-            this.LblReg.Size = new System.Drawing.Size(166, 13);
+            this.LblReg.Size = new System.Drawing.Size(161, 16);
             this.LblReg.TabIndex = 23;
             this.LblReg.Text = "Регистрация нового заказчика";
             this.LblReg.Click += new System.EventHandler(this.LblReg_Click);
@@ -114,10 +117,11 @@
             // BtnLogin
             // 
             this.BtnLogin.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
-            this.BtnLogin.Location = new System.Drawing.Point(166, 411);
+            this.BtnLogin.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.BtnLogin.Location = new System.Drawing.Point(249, 437);
             this.BtnLogin.Margin = new System.Windows.Forms.Padding(2);
             this.BtnLogin.Name = "BtnLogin";
-            this.BtnLogin.Size = new System.Drawing.Size(63, 23);
+            this.BtnLogin.Size = new System.Drawing.Size(126, 43);
             this.BtnLogin.TabIndex = 22;
             this.BtnLogin.Text = "Вход";
             this.BtnLogin.UseVisualStyleBackColor = false;
@@ -126,10 +130,11 @@
             // CbxShowPass
             // 
             this.CbxShowPass.AutoSize = true;
-            this.CbxShowPass.Location = new System.Drawing.Point(110, 272);
+            this.CbxShowPass.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.CbxShowPass.Location = new System.Drawing.Point(200, 247);
             this.CbxShowPass.Margin = new System.Windows.Forms.Padding(2);
             this.CbxShowPass.Name = "CbxShowPass";
-            this.CbxShowPass.Size = new System.Drawing.Size(177, 17);
+            this.CbxShowPass.Size = new System.Drawing.Size(174, 20);
             this.CbxShowPass.TabIndex = 21;
             this.CbxShowPass.Text = "Показывать символы пароля";
             this.CbxShowPass.UseVisualStyleBackColor = true;
@@ -137,63 +142,69 @@
             // 
             // TbxPass
             // 
-            this.TbxPass.Location = new System.Drawing.Point(110, 242);
+            this.TbxPass.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.TbxPass.Location = new System.Drawing.Point(200, 217);
             this.TbxPass.Margin = new System.Windows.Forms.Padding(2);
             this.TbxPass.Name = "TbxPass";
-            this.TbxPass.Size = new System.Drawing.Size(178, 20);
+            this.TbxPass.Size = new System.Drawing.Size(178, 22);
             this.TbxPass.TabIndex = 20;
             this.TbxPass.UseSystemPasswordChar = true;
             // 
             // TbxLogin
             // 
-            this.TbxLogin.Location = new System.Drawing.Point(110, 199);
+            this.TbxLogin.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.TbxLogin.Location = new System.Drawing.Point(200, 174);
             this.TbxLogin.Margin = new System.Windows.Forms.Padding(2);
             this.TbxLogin.Name = "TbxLogin";
-            this.TbxLogin.Size = new System.Drawing.Size(178, 20);
+            this.TbxLogin.Size = new System.Drawing.Size(178, 22);
             this.TbxLogin.TabIndex = 19;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(112, 224);
+            this.label4.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label4.Location = new System.Drawing.Point(202, 199);
             this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(88, 13);
+            this.label4.Size = new System.Drawing.Size(89, 16);
             this.label4.TabIndex = 18;
             this.label4.Text = "Введите пароль";
             // 
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(110, 182);
+            this.label3.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label3.Location = new System.Drawing.Point(200, 157);
             this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(81, 13);
+            this.label3.Size = new System.Drawing.Size(81, 16);
             this.label3.TabIndex = 17;
             this.label3.Text = "Введите логин";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(110, 132);
+            this.label2.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label2.Location = new System.Drawing.Point(13, 177);
             this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(152, 13);
+            this.label2.Size = new System.Drawing.Size(154, 16);
             this.label2.TabIndex = 16;
             this.label2.Text = "Выберите, кто авторизуется";
             // 
             // CmbRole
             // 
             this.CmbRole.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.CmbRole.Font = new System.Drawing.Font("Arial Narrow", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.CmbRole.FormattingEnabled = true;
             this.CmbRole.Items.AddRange(new object[] {
             "Заказчик",
             "Менеджер",
             "Кладовщик"});
-            this.CmbRole.Location = new System.Drawing.Point(110, 151);
+            this.CmbRole.Location = new System.Drawing.Point(13, 196);
             this.CmbRole.Margin = new System.Windows.Forms.Padding(2);
             this.CmbRole.Name = "CmbRole";
-            this.CmbRole.Size = new System.Drawing.Size(178, 21);
+            this.CmbRole.Size = new System.Drawing.Size(178, 24);
             this.CmbRole.TabIndex = 15;
             // 
             // panel1
@@ -211,7 +222,7 @@
             // label1
             // 
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 13.8F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.label1.Font = new System.Drawing.Font("Arial Narrow", 20.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
             this.label1.Location = new System.Drawing.Point(133, 0);
             this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label1.Name = "label1";

+ 6 - 6
СУБД Швейная фабрика/FormKladovschik.Designer.cs

@@ -389,10 +389,10 @@
             // BtnSpisMaterial
             // 
             this.BtnSpisMaterial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
-            this.BtnSpisMaterial.Location = new System.Drawing.Point(426, 109);
+            this.BtnSpisMaterial.Location = new System.Drawing.Point(565, 108);
             this.BtnSpisMaterial.Margin = new System.Windows.Forms.Padding(2);
             this.BtnSpisMaterial.Name = "BtnSpisMaterial";
-            this.BtnSpisMaterial.Size = new System.Drawing.Size(154, 23);
+            this.BtnSpisMaterial.Size = new System.Drawing.Size(194, 25);
             this.BtnSpisMaterial.TabIndex = 20;
             this.BtnSpisMaterial.Text = "Списать материалы";
             this.BtnSpisMaterial.UseVisualStyleBackColor = false;
@@ -401,10 +401,10 @@
             // BtnGetMaterial
             // 
             this.BtnGetMaterial.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
-            this.BtnGetMaterial.Location = new System.Drawing.Point(267, 109);
+            this.BtnGetMaterial.Location = new System.Drawing.Point(343, 108);
             this.BtnGetMaterial.Margin = new System.Windows.Forms.Padding(2);
             this.BtnGetMaterial.Name = "BtnGetMaterial";
-            this.BtnGetMaterial.Size = new System.Drawing.Size(154, 23);
+            this.BtnGetMaterial.Size = new System.Drawing.Size(194, 25);
             this.BtnGetMaterial.TabIndex = 19;
             this.BtnGetMaterial.Text = "Принять материалы";
             this.BtnGetMaterial.UseVisualStyleBackColor = false;
@@ -413,10 +413,10 @@
             // BtnProfile
             // 
             this.BtnProfile.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(156)))), ((int)(((byte)(26)))));
-            this.BtnProfile.Location = new System.Drawing.Point(108, 109);
+            this.BtnProfile.Location = new System.Drawing.Point(127, 108);
             this.BtnProfile.Margin = new System.Windows.Forms.Padding(2);
             this.BtnProfile.Name = "BtnProfile";
-            this.BtnProfile.Size = new System.Drawing.Size(154, 23);
+            this.BtnProfile.Size = new System.Drawing.Size(194, 25);
             this.BtnProfile.TabIndex = 18;
             this.BtnProfile.Text = "Профиль пользователя";
             this.BtnProfile.UseVisualStyleBackColor = false;

+ 4 - 4
СУБД Швейная фабрика/FormManager.Designer.cs

@@ -370,7 +370,7 @@
             this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
-            this.tabPage2.Size = new System.Drawing.Size(676, 307);
+            this.tabPage2.Size = new System.Drawing.Size(673, 307);
             this.tabPage2.TabIndex = 1;
             this.tabPage2.Text = "Ткани";
             this.tabPage2.UseVisualStyleBackColor = true;
@@ -443,7 +443,7 @@
             this.tabPage3.Margin = new System.Windows.Forms.Padding(2);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.Padding = new System.Windows.Forms.Padding(2);
-            this.tabPage3.Size = new System.Drawing.Size(676, 307);
+            this.tabPage3.Size = new System.Drawing.Size(673, 307);
             this.tabPage3.TabIndex = 2;
             this.tabPage3.Text = "Фурнитуры";
             this.tabPage3.UseVisualStyleBackColor = true;
@@ -495,7 +495,7 @@
             this.tabPage4.Margin = new System.Windows.Forms.Padding(2);
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.Padding = new System.Windows.Forms.Padding(2);
-            this.tabPage4.Size = new System.Drawing.Size(676, 307);
+            this.tabPage4.Size = new System.Drawing.Size(673, 307);
             this.tabPage4.TabIndex = 3;
             this.tabPage4.Text = "Изделия";
             this.tabPage4.UseVisualStyleBackColor = true;
@@ -635,7 +635,7 @@
             this.BtnProfile.Location = new System.Drawing.Point(98, 109);
             this.BtnProfile.Margin = new System.Windows.Forms.Padding(2);
             this.BtnProfile.Name = "BtnProfile";
-            this.BtnProfile.Size = new System.Drawing.Size(154, 23);
+            this.BtnProfile.Size = new System.Drawing.Size(231, 24);
             this.BtnProfile.TabIndex = 19;
             this.BtnProfile.Text = "Профиль пользователя";
             this.BtnProfile.UseVisualStyleBackColor = false;

+ 2 - 2
СУБД Швейная фабрика/FormZakazchik.cs

@@ -44,7 +44,7 @@ where Users.id_User = {LblIdUser.Text}";
             // TODO: This line of code loads data into the 'db_22factoryDataSet1.Users' table. You can move, or remove it, as needed.
             this.usersTableAdapter.Fill(this.pracFabricaDataSet.Users);
             FillListZakaz();
-            OutPut();
+            //
         }
 
         void OutPut()
@@ -60,7 +60,7 @@ where Users.id_User = {LblIdUser.Text}";
 
         private void BtnProfile_Click(object sender, EventArgs e)
         {
-            OutPut();
+            //
             FormProfile frm = new FormProfile();
             frm.BsUsers.Filter = this.BsUsers.Filter;
             if (frm.ShowDialog() == DialogResult.OK)

BIN
СУБД Швейная фабрика/bin/Debug/СУБД Швейная фабрика.exe


BIN
СУБД Швейная фабрика/bin/Debug/СУБД Швейная фабрика.pdb


BIN
СУБД Швейная фабрика/obj/Debug/СУБД Швейная фабрика.csproj.GenerateResource.cache


BIN
СУБД Швейная фабрика/obj/Debug/СУБД Швейная фабрика.exe


BIN
СУБД Швейная фабрика/obj/Debug/СУБД Швейная фабрика.pdb