edit something (print schedule...)

Client/Forms/ControlSchedule.cs

@@ -40,21 +40,5 @@ private void picContent_Click(object sender, EventArgs e)
             //'+' 아이콘 클릭 시 일정 내용 메세지박스로 출력
             MessageBox.Show(ctent, "스케줄 내용", MessageBoxButtons.OK, MessageBoxIcon.Information);
         }
-
-        private void picDelete_Click(object sender, EventArgs e)
-        {
-            //클릭 시 스케줄 수동 삭제
-            //기간 만기 시 자동삭제는 어디서해야할까?
-            var result = MessageBox.Show(
-                "일정을 삭제하시겠습니까?",
-                "Caption",
-                MessageBoxButtons.OKCancel,
-                MessageBoxIcon.Question
-                );
-            if(result == DialogResult.OK)
-            {
-                //컨트롤 삭제 코드
-            }
-        }
     }
 }

Client/Forms/ControlSchedule.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACq
-        BwAAAk1TRnQBSQFMAgEBBAEAAVABAAFQAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        BwAAAk1TRnQBSQFMAgEBBAEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Client/Forms/FormMain.cs

@@ -16,7 +16,6 @@ public partial class FormMain : MetroForm
     {
         Dictionary<string, FormRoom> formChats;             // 켜져있는 채팅방들
         Dictionary<string, ControlRoomCard> roomCards;      // 나의 채팅방 카드들
-        Dictionary<int, ControlSchedule> scheduleCards;  //나의 스케줄 카드들
 
         public FormMain()
         {
@@ -53,7 +52,7 @@ private void FormMain_Shown(object sender, EventArgs e)
             formChats = new Dictionary<string, FormRoom>();
             roomCards = new Dictionary<string, ControlRoomCard>();
             // 스케줄 관련 컨트롤들 배열 초기화
-            scheduleCards = new Dictionary<int, ControlSchedule>();
+            List<Schedule> scheduleCards = new List<Schedule>();
 
             // 최초 룸 모두 추가
             Program.rooms.ForEach(AddRoomCard);
@@ -268,8 +267,13 @@ void AddRoomCard(Room room)
         void AddScheduleCard(Schedule schedule) //스케줄카드 생성
         {
             ControlSchedule Cardschedule = new ControlSchedule(schedule);
-
-            scheduleCards.Add(Program.employee.id, Cardschedule);
+            List<Schedule> ScheduleCards = new List<Schedule>();
+            //스케줄 카드 추가
+            if (DateTime.Now < schedule.end)
+            {
+                tpSchedule.Controls.Add(Cardschedule);
+                ScheduleCards.Add(schedule);
+            }
         }
         void ReceiveRoom(Packet p)
         {

Client/Panels/PanelSchedule.cs

@@ -38,6 +38,13 @@ private void picClose_Click(object sender, EventArgs e)
         private void tleSubmit_Click(object sender, EventArgs e)
         {
             // Panel -> Client.cs(Server)
+            if(dtpStart.Value < DateTime.Now || dtpStart.Value > dtpEnd.Value)
+            {
+                MessageBox.Show("잘못된 날짜 형식입니다. 날짜를 올바르게 다시 설정해주십시오.",
+                    "오류", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+
             try
             {
                 Program.Send(new SchedulePacket(new Schedule(Program.employee.id, txtTitle.Text, dtpStart.Value, dtpEnd.Value,

Server/Classes/Client.cs

@@ -141,7 +141,6 @@ public void Recieve()
                         }
 
                         List<Schedule> mySchedule = Database.GetSchedule(emp);
-
                         p = new LoginPacket(true, Program.employees, myRooms, mySchedule);
                     }
 

Server/Classes/Database.cs

@@ -166,7 +166,7 @@ public static List<Schedule> GetSchedule(Employee emp)
         {
             List<Schedule> schedules = new List<Schedule>();
 
-            string sql = $"SELECT author, title, start, end, range, contents FROM schedule WHERE author={emp.id}";
+            string sql = $"SELECT author, title, start, end, scope, contents FROM schedule WHERE author={emp.id}";
             MySqlCommand cmd = new MySqlCommand(sql, con);
 
             using (MySqlDataReader rdr = cmd.ExecuteReader())
@@ -179,7 +179,7 @@ public static List<Schedule> GetSchedule(Employee emp)
                             rdr.GetString("title"),
                             rdr.GetDateTime("start"),
                             rdr.GetDateTime("end"),
-                            rdr.GetString("range"),
+                            rdr.GetString("scope"),
                             rdr.GetString("contents")));
                 }
             }

Server/Program.cs

@@ -15,7 +15,6 @@ class Program
 
         public static Dictionary<int, Client> clients;          // 로그인 후 클라이언트들
         public static Dictionary<int, Employee> employees;      // 사원들 정보
-        public static Dictionary<int, Schedule> schedules;      // 스케줄 정보들
         public static Dictionary<string, List<int>> roomEmps;   // 각 룸에 있는 접속된 사원 번호
 
         static void Main(string[] args)
@@ -25,7 +24,6 @@ static void Main(string[] args)
             clients = new Dictionary<int, Client>();
             unloginedClients = new List<Client>();
             roomEmps = new Dictionary<string, List<int>>();
-            schedules = new Dictionary<int, Schedule>();
 
             // 데이터 베이스 접속
             if (Database.Connect())