diff --git a/Project/Web/Controller/BaseController.cs b/Project/Web/Controller/BaseController.cs
index 4709f07..ca7e71c 100644
--- a/Project/Web/Controller/BaseController.cs
+++ b/Project/Web/Controller/BaseController.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Net;
using System.Web.Http;
using agi = HtmlAgilityPack;
-
+using Project.Web.Model;
namespace Project.Web.Controllers
{
diff --git a/Project/Web/Controller/HomeController.cs b/Project/Web/Controller/HomeController.cs
index 1fde961..d67aa20 100644
--- a/Project/Web/Controller/HomeController.cs
+++ b/Project/Web/Controller/HomeController.cs
@@ -1,299 +1,299 @@
-using System;
-using System.Linq;
-using System.Net.Http;
-using System.Web.Http;
-using Newtonsoft.Json;
-using System.Collections.Generic;
+//using System;
+//using System.Linq;
+//using System.Net.Http;
+//using System.Web.Http;
+//using Newtonsoft.Json;
+//using System.Collections.Generic;
-namespace Project.Web.Controllers
-{
- // 로그인 요청 모델
- public class LoginRequest
- {
- public string UserId { get; set; }
- public string Password { get; set; }
- public bool RememberMe { get; set; }
- }
+//namespace Project.Web.Controllers
+//{
+// // 로그인 요청 모델
+// public class LoginRequest
+// {
+// public string UserId { get; set; }
+// public string Password { get; set; }
+// public bool RememberMe { get; set; }
+// }
- // 로그인 응답 모델
- public class LoginResponse
- {
- public bool Success { get; set; }
- public string Message { get; set; }
- public string RedirectUrl { get; set; }
- public object UserData { get; set; }
- }
+// // 로그인 응답 모델
+// public class LoginResponse
+// {
+// public bool Success { get; set; }
+// public string Message { get; set; }
+// public string RedirectUrl { get; set; }
+// public object UserData { get; set; }
+// }
- public class HomeController : BaseController
- {
- [HttpPost]
- public void Index([FromBody]string value)
- {
+// public class HomeController : BaseController
+// {
+// [HttpPost]
+// public void Index([FromBody]string value)
+// {
- }
+// }
- // PUT api/values/5
- public void Put(int id, [FromBody]string value)
- {
- }
+// // PUT api/values/5
+// public void Put(int id, [FromBody]string value)
+// {
+// }
- // DELETE api/values/5
- public void Delete(int id)
- {
- }
+// // DELETE api/values/5
+// public void Delete(int id)
+// {
+// }
- [HttpGet]
- public string Test()
- {
- return "test";
- }
+// [HttpGet]
+// public string Test()
+// {
+// return "test";
+// }
- [HttpPost]
- public HttpResponseMessage Login([FromBody] LoginRequest request)
- {
- var response = new LoginResponse();
+// [HttpPost]
+// public HttpResponseMessage Login([FromBody] LoginRequest request)
+// {
+// var response = new LoginResponse();
- try
- {
- // 입력값 검증
- if (string.IsNullOrEmpty(request?.UserId) || string.IsNullOrEmpty(request?.Password))
- {
- response.Success = false;
- response.Message = "사용자 ID와 비밀번호를 입력해주세요.";
- return CreateJsonResponse(response);
- }
+// try
+// {
+// // 입력값 검증
+// if (string.IsNullOrEmpty(request?.UserId) || string.IsNullOrEmpty(request?.Password))
+// {
+// response.Success = false;
+// response.Message = "사용자 ID와 비밀번호를 입력해주세요.";
+// return CreateJsonResponse(response);
+// }
- // TODO: 여기에 실제 데이터베이스 로그인 로직을 구현하세요
- // 예시: 데이터베이스에서 사용자 정보 확인
- bool isValidUser = ValidateUser(request.UserId, request.Password);
+// // TODO: 여기에 실제 데이터베이스 로그인 로직을 구현하세요
+// // 예시: 데이터베이스에서 사용자 정보 확인
+// bool isValidUser = ValidateUser(request.UserId, request.Password);
- if (isValidUser)
- {
- // 로그인 성공
- response.Success = true;
- response.Message = "로그인에 성공했습니다.";
- response.RedirectUrl = "/DashBoard";
+// if (isValidUser)
+// {
+// // 로그인 성공
+// response.Success = true;
+// response.Message = "로그인에 성공했습니다.";
+// response.RedirectUrl = "/DashBoard";
- // 사용자 정보 설정 (세션 또는 쿠키)
- SetUserSession(request.UserId, request.RememberMe);
+// // 사용자 정보 설정 (세션 또는 쿠키)
+// SetUserSession(request.UserId, request.RememberMe);
- // 사용자 데이터 반환
- response.UserData = new
- {
- UserId = request.UserId,
- LoginTime = DateTime.Now,
- RememberMe = request.RememberMe
- };
- }
- else
- {
- // 로그인 실패
- response.Success = false;
- response.Message = "사용자 ID 또는 비밀번호가 올바르지 않습니다.";
- }
- }
- catch (Exception ex)
- {
- response.Success = false;
- response.Message = "로그인 처리 중 오류가 발생했습니다: " + ex.Message;
- }
+// // 사용자 데이터 반환
+// response.UserData = new
+// {
+// UserId = request.UserId,
+// LoginTime = DateTime.Now,
+// RememberMe = request.RememberMe
+// };
+// }
+// else
+// {
+// // 로그인 실패
+// response.Success = false;
+// response.Message = "사용자 ID 또는 비밀번호가 올바르지 않습니다.";
+// }
+// }
+// catch (Exception ex)
+// {
+// response.Success = false;
+// response.Message = "로그인 처리 중 오류가 발생했습니다: " + ex.Message;
+// }
- return CreateJsonResponse(response);
- }
+// return CreateJsonResponse(response);
+// }
- [HttpPost]
- public HttpResponseMessage Logout()
- {
- var response = new LoginResponse();
+// [HttpPost]
+// public HttpResponseMessage Logout()
+// {
+// var response = new LoginResponse();
- try
- {
- // TODO: 여기에 로그아웃 로직을 구현하세요
- // 예시: 세션 정리, 쿠키 삭제 등
- ClearUserSession();
+// try
+// {
+// // TODO: 여기에 로그아웃 로직을 구현하세요
+// // 예시: 세션 정리, 쿠키 삭제 등
+// ClearUserSession();
- response.Success = true;
- response.Message = "로그아웃되었습니다.";
- response.RedirectUrl = "/Login";
- }
- catch (Exception ex)
- {
- response.Success = false;
- response.Message = "로그아웃 처리 중 오류가 발생했습니다: " + ex.Message;
- }
+// response.Success = true;
+// response.Message = "로그아웃되었습니다.";
+// response.RedirectUrl = "/Login";
+// }
+// catch (Exception ex)
+// {
+// response.Success = false;
+// response.Message = "로그아웃 처리 중 오류가 발생했습니다: " + ex.Message;
+// }
- return CreateJsonResponse(response);
- }
+// return CreateJsonResponse(response);
+// }
- [HttpGet]
- public HttpResponseMessage CheckLoginStatus()
- {
- var response = new LoginResponse();
+// [HttpGet]
+// public HttpResponseMessage CheckLoginStatus()
+// {
+// var response = new LoginResponse();
- try
- {
- // TODO: 여기에 로그인 상태 확인 로직을 구현하세요
- // 예시: 세션 또는 쿠키에서 사용자 정보 확인
- var currentUser = GetCurrentUser();
+// try
+// {
+// // TODO: 여기에 로그인 상태 확인 로직을 구현하세요
+// // 예시: 세션 또는 쿠키에서 사용자 정보 확인
+// var currentUser = GetCurrentUser();
- if (currentUser != null)
- {
- response.Success = true;
- response.Message = "로그인된 상태입니다.";
- response.UserData = currentUser;
- }
- else
- {
- response.Success = false;
- response.Message = "로그인되지 않은 상태입니다.";
- response.RedirectUrl = "/Login";
- }
- }
- catch (Exception ex)
- {
- response.Success = false;
- response.Message = "로그인 상태 확인 중 오류가 발생했습니다: " + ex.Message;
- }
+// if (currentUser != null)
+// {
+// response.Success = true;
+// response.Message = "로그인된 상태입니다.";
+// response.UserData = currentUser;
+// }
+// else
+// {
+// response.Success = false;
+// response.Message = "로그인되지 않은 상태입니다.";
+// response.RedirectUrl = "/Login";
+// }
+// }
+// catch (Exception ex)
+// {
+// response.Success = false;
+// response.Message = "로그인 상태 확인 중 오류가 발생했습니다: " + ex.Message;
+// }
- return CreateJsonResponse(response);
- }
+// return CreateJsonResponse(response);
+// }
- // 헬퍼 메서드들
- private bool ValidateUser(string userId, string password)
- {
- // TODO: 실제 데이터베이스 검증 로직을 여기에 구현하세요
- // 예시: 데이터베이스에서 사용자 정보 조회 및 비밀번호 검증
- var encpass = Pub.MakePasswordEnc(password.Trim());
+// // 헬퍼 메서드들
+// private bool ValidateUser(string userId, string password)
+// {
+// // TODO: 실제 데이터베이스 검증 로직을 여기에 구현하세요
+// // 예시: 데이터베이스에서 사용자 정보 조회 및 비밀번호 검증
+// var encpass = Pub.MakePasswordEnc(password.Trim());
- // 임시 테스트용 (실제로는 데이터베이스에서 확인)
- return userId == "admin" && password == "admin";
- }
+// // 임시 테스트용 (실제로는 데이터베이스에서 확인)
+// return userId == "admin" && password == "admin";
+// }
- private void SetUserSession(string userId, bool rememberMe)
- {
- // TODO: 세션 또는 쿠키에 사용자 정보 저장
- // 예시: HttpContext.Session["UserId"] = userId;
- // 예시: 쿠키 설정 (rememberMe가 true인 경우)
- //데이터베이스에서 해당 정보를 찾아와서 처리해야한다
+// private void SetUserSession(string userId, bool rememberMe)
+// {
+// // TODO: 세션 또는 쿠키에 사용자 정보 저장
+// // 예시: HttpContext.Session["UserId"] = userId;
+// // 예시: 쿠키 설정 (rememberMe가 true인 경우)
+// //데이터베이스에서 해당 정보를 찾아와서 처리해야한다
- FCOMMON.info.Login.no = userId;
- FCOMMON.info.Login.nameK = drUser.name;
- FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
- FCOMMON.info.Login.level = drGrpUser.level;
- FCOMMON.info.Login.email = drUser.email;
- FCOMMON.info.Login.nameE = drUser.nameE;
- FCOMMON.info.Login.hp = drUser.hp;
- FCOMMON.info.Login.tel = drUser.tel;
- FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")";
- FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
- //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
- var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
- FCOMMON.info.Login.gcode = gCode;// gcode;
- FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process;
- FCOMMON.info.Login.permission = 0;
- FCOMMON.info.Login.gpermission = int.Parse(gperm);
- //FCOMMON.info.datapath = Pub.setting.SharedDataPath;
- FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
+// FCOMMON.info.Login.no = userId;
+// FCOMMON.info.Login.nameK = drUser.name;
+// FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
+// FCOMMON.info.Login.level = drGrpUser.level;
+// FCOMMON.info.Login.email = drUser.email;
+// FCOMMON.info.Login.nameE = drUser.nameE;
+// FCOMMON.info.Login.hp = drUser.hp;
+// FCOMMON.info.Login.tel = drUser.tel;
+// FCOMMON.info.Login.title = drUser.dept + "(" + drUser.grade + ")";
+// FCOMMON.info.NotShowJobReportview = Pub.setting.NotShowJobreportPRewView;
+// //var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'");
+// var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'");
+// FCOMMON.info.Login.gcode = gCode;// gcode;
+// FCOMMON.info.Login.process = drUser.id == "dev" ? "개발자" : drGrpUser.Process;
+// FCOMMON.info.Login.permission = 0;
+// FCOMMON.info.Login.gpermission = int.Parse(gperm);
+// //FCOMMON.info.datapath = Pub.setting.SharedDataPath;
+// FCOMMON.info.ShowBuyerror = Pub.setting.Showbuyerror; //210625
- }
+// }
- private void ClearUserSession()
- {
- // TODO: 세션 또는 쿠키에서 사용자 정보 삭제
- FCOMMON.info.Login.no = string.Empty;
- FCOMMON.info.Login.level = 0;
- FCOMMON.info.Login.gcode = string.Empty;
- FCOMMON.info.Login.permission = 0;
- FCOMMON.info.Login.gpermission = 0;
- Console.WriteLine("logout");
- }
+// private void ClearUserSession()
+// {
+// // TODO: 세션 또는 쿠키에서 사용자 정보 삭제
+// FCOMMON.info.Login.no = string.Empty;
+// FCOMMON.info.Login.level = 0;
+// FCOMMON.info.Login.gcode = string.Empty;
+// FCOMMON.info.Login.permission = 0;
+// FCOMMON.info.Login.gpermission = 0;
+// Console.WriteLine("logout");
+// }
- private object GetCurrentUser()
- {
- // TODO: 현재 로그인된 사용자 정보 반환
- // 예시: HttpContext.Session["UserId"]에서 사용자 정보 조회
- return null; // 임시로 null 반환
- }
+// private object GetCurrentUser()
+// {
+// // TODO: 현재 로그인된 사용자 정보 반환
+// // 예시: HttpContext.Session["UserId"]에서 사용자 정보 조회
+// return null; // 임시로 null 반환
+// }
- private HttpResponseMessage CreateJsonResponse(object data)
- {
- var json = JsonConvert.SerializeObject(data, new JsonSerializerSettings
- {
- NullValueHandling = NullValueHandling.Ignore
- });
+// private HttpResponseMessage CreateJsonResponse(object data)
+// {
+// var json = JsonConvert.SerializeObject(data, new JsonSerializerSettings
+// {
+// NullValueHandling = NullValueHandling.Ignore
+// });
- return new HttpResponseMessage()
- {
- Content = new StringContent(
- json,
- System.Text.Encoding.UTF8,
- "application/json")
- };
- }
+// return new HttpResponseMessage()
+// {
+// Content = new StringContent(
+// json,
+// System.Text.Encoding.UTF8,
+// "application/json")
+// };
+// }
- [HttpGet]
- public HttpResponseMessage Login()
- {
- // 직접 파일을 읽어서 반환
- var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "login.html");
- var contents = string.Empty;
+// [HttpGet]
+// public HttpResponseMessage Login()
+// {
+// // 직접 파일을 읽어서 반환
+// var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "login.html");
+// var contents = string.Empty;
- if (System.IO.File.Exists(filePath))
- {
- contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
- }
- else
- {
- // 파일이 없으면 404 에러 페이지 또는 기본 메시지
- contents = "404 - File Not Found
The requested file was not found: " + filePath + "
";
- }
+// if (System.IO.File.Exists(filePath))
+// {
+// contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
+// }
+// else
+// {
+// // 파일이 없으면 404 에러 페이지 또는 기본 메시지
+// contents = "404 - File Not Found
The requested file was not found: " + filePath + "
";
+// }
- //공용값 적용
- ApplyCommonValue(ref contents);
+// //공용값 적용
+// ApplyCommonValue(ref contents);
- var resp = new HttpResponseMessage()
- {
- Content = new StringContent(
- contents,
- System.Text.Encoding.UTF8,
- "text/html")
- };
+// var resp = new HttpResponseMessage()
+// {
+// Content = new StringContent(
+// contents,
+// System.Text.Encoding.UTF8,
+// "text/html")
+// };
- return resp;
- }
+// return resp;
+// }
- [HttpGet]
- public HttpResponseMessage Index()
- {
- // 직접 파일을 읽어서 반환
- var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "index.html");
- var contents = string.Empty;
+// [HttpGet]
+// public HttpResponseMessage Index()
+// {
+// // 직접 파일을 읽어서 반환
+// var filePath = System.IO.Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Web", "wwwroot", "index.html");
+// var contents = string.Empty;
- if (System.IO.File.Exists(filePath))
- {
- contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
- }
- else
- {
- // 파일이 없으면 404 에러 페이지 또는 기본 메시지
- contents = "404 - File Not Found
The requested file was not found: " + filePath + "
";
- }
+// if (System.IO.File.Exists(filePath))
+// {
+// contents = System.IO.File.ReadAllText(filePath, System.Text.Encoding.UTF8);
+// }
+// else
+// {
+// // 파일이 없으면 404 에러 페이지 또는 기본 메시지
+// contents = "404 - File Not Found
The requested file was not found: " + filePath + "
";
+// }
- //공용값 적용
- ApplyCommonValue(ref contents);
+// //공용값 적용
+// ApplyCommonValue(ref contents);
- var resp = new HttpResponseMessage()
- {
- Content = new StringContent(
- contents,
- System.Text.Encoding.UTF8,
- "text/html")
- };
+// var resp = new HttpResponseMessage()
+// {
+// Content = new StringContent(
+// contents,
+// System.Text.Encoding.UTF8,
+// "text/html")
+// };
- return resp;
- }
+// return resp;
+// }
- }
-}
+// }
+//}
diff --git a/Project/fMain.cs b/Project/fMain.cs
index c3ecec2..7df7faf 100644
--- a/Project/fMain.cs
+++ b/Project/fMain.cs
@@ -204,7 +204,7 @@ namespace Project
void Func_Login()
{
- if (this.webok)
+ if (System.Diagnostics.Debugger.IsAttached)
{
using (var flogIn = new Dialog.fLogin_WB())
if (flogIn.ShowDialog() != System.Windows.Forms.DialogResult.OK)
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs
index ccf9487..b208551 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs
@@ -45,7 +45,7 @@ namespace FPJ0000
{
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
- foreach (dsReport.ProcessUserListRow dr in dtUserList)
+ foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
{
if (String.IsNullOrEmpty(dr.outdate) == false)
{
@@ -62,7 +62,7 @@ namespace FPJ0000
{
var processStr = prc;// cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
- foreach (dsReport.ProcessUserListRow dr in dtUserList)
+ foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
{
if (String.IsNullOrEmpty(dr.outdate) == false)
{
diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
index d2b0635..b2826fb 100644
--- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
+++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs
@@ -685,7 +685,6 @@
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
- this.otStartDataGridViewTextBoxColumn.Visible = false;
this.otStartDataGridViewTextBoxColumn.Width = 54;
//
// otEnd
@@ -698,7 +697,6 @@
this.otEnd.HeaderText = "종료";
this.otEnd.Name = "otEnd";
this.otEnd.ReadOnly = true;
- this.otEnd.Visible = false;
this.otEnd.Width = 54;
//
// projectNameDataGridViewTextBoxColumn
diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
index 835e587..36c3a29 100644
--- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
+++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
@@ -138,7 +138,7 @@ namespace FPJ0000
{
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
- foreach (dsReport.ProcessUserListRow dr in dtUserList)
+ foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
@@ -150,7 +150,7 @@ namespace FPJ0000
{
var processStr = prc;// cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
- foreach (dsReport.ProcessUserListRow dr in dtUserList)
+ foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t=>t.name))
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
diff --git a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
index ebf854f..470bb9f 100644
--- a/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
+++ b/SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
@@ -181,20 +181,20 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALvSURBVDhPhZLrS1NhHMf3qv6EsF70UohUyqioF6WpTQ3s
- ZjrMvM0pmprowiBbTCNTF5qoUCFK0YsK7aJTm7dtzm24Veq85v0GXpa6yzm6s/ntOWdLDYR+8OF58Tzf
- D+f5nofHTvBDZfyVEp0iolT3O0Sio8hKc8jYVU9HlGjpsGca03mxuvxY5PsDXGjvhD7pVi9b6FWTyeQ0
- 2zZhtu6yamGhMbxoQf6XWQhKR+z8DPlBT9Q94UWaZTasnXZAP8NAP8tAN81AM7UF5a9NtAzZsMkAjSMU
- 8j/NIOmFifpHEiJpoTbsWzDOOfF9jiErg15OsgXV+Ca+DdmJwAXjohP6BQcK5bMIfNDxjgtHywImb0ki
- t0VVN5BUeROVrXUoqJchUOKLAAK/8ByCpadR1ljGXcVKM1hasyM4TsVwgqiSwI8dA01oGnuNSl0uJ4mr
- CEPu21hk1gkgrL6KxOpENPYtoclkxdf+DayTnkKk3TQn4JfzD/pIspy60S68GZCiWJnBSeKrwkn4GlJf
- pkA9buOu0j5GQUF6WLM5EFLQ4xawE1qkorNrEmAY16Bafx9P23IQLbuE+IpIGKbtMJBi2YLVE+5OzEQQ
- LN0juPBI4jiTdxSx5XwYJ7Qo7EqDVJ4NwfMg1Ck/4+c8AwMpVjvlQA9h2eJA4GOP4KTYS+QvPoLM2hjc
- rgpFTNllTpItj4W4PoV8SRDYfeOsE73sLyZYSJF+WRq3wF98aN5ffJgc8oJ/rheuFwch/VUC1EMKFCry
- kPYhAcKqKBiIQE/eho4IaIeLCJS7V7iY1U0vrtPom3dyqEYXcK8mFckkKKoWIKf27s4ei33LSQQNuwLW
- NmfeFfwPG3uFlD2Cs9md9lbNj+39Du9H/+Cwyyeu0eqJkyJT2yZnNuyWzp4+1+QKhcllCuMeVqwODrZ5
- K02eev+Qi6Kode87zYOeOI93KrU13U/Y0nZCpDD7iRroHZLd+P5F2EB7C5vXjic2t/smyJN4PB7vD5/y
- nxrD4VALAAAAAElFTkSuQmCC
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UghTyqioF6WpTQ3s
+ Zipm3uYUTW3owiBbzEXmJTRRoUKUohcV2kWnNm9zzm24ieY0Ne838LLUXc7Rnc1vzzlbzkDoBx+eF8/5
+ fji/7zk8dkIeKROvlmgVkaXa36ESLUVOmqOMPXV0ZImGDn+uNl4QqyqOR304xIX2T9jTXtWqmV43Go0O
+ k3UbJouHdTMLjZ/LZhR8nUds6ZiNnyX3ckddE1GkXmXDmlk7dHMMdPMMtLMM1DM7UP7aRuuoFdsM0DRG
+ oeDzHFJeGql/JKGSVmrLtgPDggMDCww5GfRzkh30TG7j+6iNCJwwLDugW7JDJp9H0MPO91w4pixw+rYk
+ aldYfRMpVbdQ1VaPwoYyBEn8EEjgy84jRHoG5U3l3CoWmsHKhg0hCT0MJ4guCfrUOdyM5ok3qNLmcZKE
+ ynDkvYtHdn0sBDXXkFyTjKahFTQbLfj2YwubpKdQaS/NCfgVfC9fSY5DO96Nt8NSFCuzOElidQQJX0f6
+ qzSoJq3cKh0TFBSkhw2rHaGFfS4BO2FFPbSoNgn6STVqdA/wrD0XMWWXkVgZBf2sDXpSLFuwasrViYkI
+ QqT7BBcfS+xn848hvoIPw5QGsu4MSOUixL4IRr3yCwYXGehJsZoZO/oIq2Y7gp64BafE3sIA8VFk18Xh
+ TnUY4sqvcBKRPB7ihjTyJsFg7w3zDvSzn5hgJkX656hdggDx4cUA8RHykDcC8rxxozgYma+ToBpVQKbI
+ R8bHJAiqo6EnAh35N7REQNudRKD0rHApp5de3qQxtOjg6Blfwv3adKSSoLAmFrl19/buWGw7DiJo9AhY
+ 24LJI/gfVnaFtH2Cc6IuW2vvwO5BDx+IcdR5IqHJ4o6TItPbp+e2bOYu9aBzeo3C9CqFSTdrFjsH27yF
+ dsAwNOKkKGrT527LiDvO451Ob8v0F7S2nxQqTP7CRnqPVBd+fxE00j6Clg3f5JYOvyR5Co/H4/0Bl8Sf
+ DuVD3wEAAAAASUVORK5CYII=
@@ -255,7 +255,7 @@
iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAANSSURBVFhH7djZTxNRGAVw/gjjvq9tVWgBAbUguO+aGE18
8N0XFROj4oYitHbB0haL4i4qGhUTRew27bS1pRSEJ4kkKCZuiRhJpEQE5TjDTKPEpL13TPClJ7nP95e5
- c+a7mZRkkklGQu5saSus3RyK3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
+ c+a7mZRkkklGQu5saSus3RyM3t7UilsbubXhOW6uf46adS24sbYF19c049rqZlxdxa2VEVxZEcHl5U24
VNCEi/lhVC8L40JeI87ncksdQtXSEGxLQji3OIjKnCCs2c9gyeLWogDMmQFUZPijZ9PZfeL2iTPKOJjS
/dCr/L3i9okz2rizKj/KlT6I2yfO/8AZ02iAhLiLBWHY8nwwq12oVLOoyg1JxhlTWXIg6ZOrzGXRer8L
A99+oK3uDSxLGck4w0IKIPGxbmXxZwLVL2HO8UrC6Rd4yYGk75w1n0HP+z6RBwz9HMK9/RGYs33UON18
@@ -267,7 +267,7 @@
3uwUWULamfcoUTwhxhVPc5ADaXC6NDceHGoWWUK6X3+FJrMBGjlDjDsxlQJIijOkeVG1zTvistDPXRYs
613UuONTKIAkOH58aVVPR5aCu27V7A6iVOakxh2bbCcHkuD42WoqcIo0IXwpSmR2SbijkyiAJDh+tpbN
t6Ppdie+9w0ifKsTp+RPJOOOTHxKDiTB8YNft8AzPCFOyh7/05PjcUUTaIAEuESDnxZXNL6BHPg/cIfH
- UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AKb0PpQCSEV4AAAAAElFTkSuQmCC
+ UQA5XHS0cQfG1pP/+uB/5PD/SkYTd3BM/V5x+2SSSYY8KSm/AHvBPpKbf2MsAAAAAElFTkSuQmCC