diff --git a/SkillCourse/Forms/MainForm.cs b/SkillCourse/Forms/MainForm.cs index 390fef0..32e184a 100644 --- a/SkillCourse/Forms/MainForm.cs +++ b/SkillCourse/Forms/MainForm.cs @@ -47,15 +47,11 @@ public MainForm() //Random(); - //SubscriptionCourse sub = new SubscriptionCourse(3, 101); - //SkillCourseDB.Instance.Subscriptions.Add(sub); - //SubscriptionCourse sub2 = new SubscriptionCourse(2, 101); - //SkillCourseDB.Instance.Subscriptions.Add(sub2); - //Certificate certificate = new Certificate("По завершению долгожданного...", DateTime.Now, 1, 3, 99); + //Certificate certificate = new Certificate("По завершению долгожданного...", DateTime.Now, 3, 1, 1); //SkillCourseDB.Instance.Certificates.Add(certificate); - //Certificate certificate1 = new Certificate("Ты снова пришёл сюда?", DateTime.Now, 5, 3, 98); + //Certificate certificate1 = new Certificate("Ты снова пришёл сюда?", DateTime.Now, 3, 1, 2); //SkillCourseDB.Instance.Certificates.Add(certificate1); - //Certificate certificate2 = new Certificate("Я думал, мы это уже обговорили, проваливай", DateTime.Now, 1, 3, 17); + //Certificate certificate2 = new Certificate("Я думал, мы это уже обговорили, проваливай", DateTime.Now, 8, 1, 4); //SkillCourseDB.Instance.Certificates.Add(certificate2); //SubscriptionCourse sub = new SubscriptionCourse(4, 101); //SkillCourseDB.Instance.Subscriptions.Add(sub); diff --git a/SkillCourse/Panels/Autorization/PanelAutorization_LogIn.Designer.cs b/SkillCourse/Panels/Autorization/PanelAutorization_LogIn.Designer.cs index 515855a..b5ce23f 100644 --- a/SkillCourse/Panels/Autorization/PanelAutorization_LogIn.Designer.cs +++ b/SkillCourse/Panels/Autorization/PanelAutorization_LogIn.Designer.cs @@ -86,7 +86,7 @@ private void InitializeComponent() newGoogleTextBox4.SelectionStart = 0; newGoogleTextBox4.Size = new Size(462, 44); newGoogleTextBox4.TabIndex = 14; - newGoogleTextBox4.TextInput = "12345678d"; + newGoogleTextBox4.TextInput = ""; newGoogleTextBox4.TextPreview = "Set A Password"; newGoogleTextBox4.UseSystemPasswordChar = true; // @@ -104,7 +104,7 @@ private void InitializeComponent() newGoogleTextBox3.SelectionStart = 0; newGoogleTextBox3.Size = new Size(462, 44); newGoogleTextBox3.TabIndex = 13; - newGoogleTextBox3.TextInput = "v_-369nmd@gmail.com"; + newGoogleTextBox3.TextInput = ""; newGoogleTextBox3.TextPreview = "Email Address"; newGoogleTextBox3.UseSystemPasswordChar = false; // diff --git a/SkillCourse/Panels/Autorization/PanelAutorization_SingUp.Designer.cs b/SkillCourse/Panels/Autorization/PanelAutorization_SingUp.Designer.cs index 298ebdf..a525bad 100644 --- a/SkillCourse/Panels/Autorization/PanelAutorization_SingUp.Designer.cs +++ b/SkillCourse/Panels/Autorization/PanelAutorization_SingUp.Designer.cs @@ -121,10 +121,10 @@ private void InitializeComponent() TextBoxLastName.Font = new Font("Arial", 12F, FontStyle.Regular, GraphicsUnit.Point); TextBoxLastName.FontTextPreview = new Font("Arial", 7F, FontStyle.Bold, GraphicsUnit.Point); TextBoxLastName.ForeColor = SystemColors.ControlLight; - TextBoxLastName.Location = new Point(243, 85); + TextBoxLastName.Location = new Point(243, 87); TextBoxLastName.Name = "TextBoxLastName"; TextBoxLastName.SelectionStart = 0; - TextBoxLastName.Size = new Size(219, 50); + TextBoxLastName.Size = new Size(219, 44); TextBoxLastName.TabIndex = 19; TextBoxLastName.TextInput = ""; TextBoxLastName.TextPreview = "Last Name"; @@ -140,10 +140,10 @@ private void InitializeComponent() TextBoxFirstName.Font = new Font("Arial", 12F, FontStyle.Regular, GraphicsUnit.Point); TextBoxFirstName.FontTextPreview = new Font("Arial", 7F, FontStyle.Bold, GraphicsUnit.Point); TextBoxFirstName.ForeColor = SystemColors.ControlLight; - TextBoxFirstName.Location = new Point(0, 85); + TextBoxFirstName.Location = new Point(0, 87); TextBoxFirstName.Name = "TextBoxFirstName"; TextBoxFirstName.SelectionStart = 0; - TextBoxFirstName.Size = new Size(218, 50); + TextBoxFirstName.Size = new Size(218, 44); TextBoxFirstName.TabIndex = 18; TextBoxFirstName.TextInput = ""; TextBoxFirstName.TextPreview = "First Name"; @@ -243,12 +243,14 @@ private void InitializeComponent() DateTimeBirthD.BorderSize = 1; DateTimeBirthD.CalendarMonthBackground = Color.FromArgb(127, 140, 141); DateTimeBirthD.Font = new Font("Segoe UI Semibold", 10.2F, FontStyle.Bold, GraphicsUnit.Point); + DateTimeBirthD.Format = DateTimePickerFormat.Long; DateTimeBirthD.Location = new Point(0, 289); DateTimeBirthD.MinDate = new DateTime(1900, 1, 1, 0, 0, 0, 0); DateTimeBirthD.MinimumSize = new Size(0, 35); DateTimeBirthD.Name = "DateTimeBirthD"; DateTimeBirthD.Size = new Size(462, 35); DateTimeBirthD.SkinColor = Color.FromArgb(40, 49, 60); + DateTimeBirthD.SpaceBeforeText = true; DateTimeBirthD.TabIndex = 30; DateTimeBirthD.TextColor = Color.FromArgb(127, 140, 141); // diff --git a/SkillCourse/Panels/MainBlock/CreateCourse/Component_CreateCourse_Naming.cs b/SkillCourse/Panels/MainBlock/CreateCourse/Component_CreateCourse_Naming.cs index 17c71d1..f4ec678 100644 --- a/SkillCourse/Panels/MainBlock/CreateCourse/Component_CreateCourse_Naming.cs +++ b/SkillCourse/Panels/MainBlock/CreateCourse/Component_CreateCourse_Naming.cs @@ -40,7 +40,7 @@ public Component_CreateCourse_Naming() Dock = DockStyle.Fill; int maxLenghtName = UserTextSize.Course.maxLenghtName; - int maxLenghtDescription = UserTextSize.Course.maxLenghtName; + int maxLenghtDescription = UserTextSize.Course.maxLenghtDescription; textBoxName.MaxLength = maxLenghtName; textBoxDescription.MaxLength = maxLenghtDescription; label2.Text = "0 / " + maxLenghtName; @@ -59,7 +59,7 @@ private void textBoxName_TextChanged(object sender, EventArgs e) private void textBoxDescription_TextChanged(object sender, EventArgs e) { ValidityCheckName(textBoxDescription); - int maxLenghtDescription = UserTextSize.Course.maxLenghtName; + int maxLenghtDescription = UserTextSize.Course.maxLenghtDescription; label4.Text = textBoxDescription.Text.Length.ToString() + " / " + maxLenghtDescription; } diff --git a/SkillCourse/Panels/MainBlock/Notification/PanelMainBlock_Message_NoCourses.cs b/SkillCourse/Panels/MainBlock/Notification/PanelMainBlock_Message_NoCourses.cs index 02df39d..0ff7404 100644 --- a/SkillCourse/Panels/MainBlock/Notification/PanelMainBlock_Message_NoCourses.cs +++ b/SkillCourse/Panels/MainBlock/Notification/PanelMainBlock_Message_NoCourses.cs @@ -23,7 +23,7 @@ public PanelMainBlock_Message_NoCourses() private void buttonAdd_Click(object sender, EventArgs e) { if (AccountHandler.Instance.UserLog is Student stud) - StudentButtonEvents.Course_SubscribedClick(); + StudentButtonEvents.Course_PublicClick(); if (AccountHandler.Instance.UserLog is Teather teac) TeacherButtonEvents.Course_CreateClick(); diff --git a/SkillCourse/Panels/MainBlock/PanelMainBlock_Courses.cs b/SkillCourse/Panels/MainBlock/PanelMainBlock_Courses.cs index fb5bb74..799642c 100644 --- a/SkillCourse/Panels/MainBlock/PanelMainBlock_Courses.cs +++ b/SkillCourse/Panels/MainBlock/PanelMainBlock_Courses.cs @@ -181,8 +181,9 @@ private UserControl CreateCourseForStudent(Course course) //Если пользователь на странице подписок, с возможностью зайти на курс if (VisibleButView && VisibleButSub) { - return new Component_BriefСourse_View_Sub(course, true, - () => NavigatePages.OpenNextPage(new PanelMainBlock_CoursePage(course)), + // return new Component_BriefСourse_View_Sub(course, true, + //() => NavigatePages.OpenNextPage(new PanelMainBlock_CoursePage(course)), + return new Component_BriefСourse_Subscription(course, true, () => { if (!((Student)handlerUser).SubscripToCourse(course))